71 files changed, 8494 insertions, 18675 deletions
diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000..4513658
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,26 @@
+POTFILES
+po/Makefile.in.in
+src/Makefile
+src/Makefile.in
+Makefile
+Makefile.in
+autom4te.cache
+configure
+src/simple-scan
+config.log
+config.status
+gnome-doc-utils.make
+aclocal.m4
+src/.deps
+po/stamp-it
+po/*.gmo
+po/.intltool-merge-cache
+src/stamp-h1
+xmldocs.make
+omf.make
+mkinstalldirs
+missing
+install-sh
+depcomp
+data/simple-scan.desktop
+data/simple-scan.schemas
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 5cdac61..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,716 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS depcomp install-sh missing \
-	mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src data help po
-EXTRA_DIST = \
-	autogen.sh \
-	simple-scan.doap
-
-DISTCLEANFILES = \
-	Makefile.in \
-	aclocal.m4 \
-	configure \
-	depcomp \
-	gnome-doc-utils.make \
-	install-sh \
-	missing \
-	mkinstalldirs \
-	omf.make \
-	xmldocs.make
-
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-generic distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
index 4a8fabf..3c161f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Overview of changes in simple-scan 2.31.5
+
+ * Prompt user to save if they are quitting/starting a new document and have
+   unsaved changes.
+ * Save button only sensitive if have unsaved data
+ * Add save as button
+
+Overview of changes in simple-scan 2.31.4
+
+ * Implement PDF writer, no longer require ImageMagick and about twice as
+   compressed as old method.
+
+Overview of changes in simple-scan 2.31.3
+
+ * Use GtkInfoBar for errors/warnings
+
 Overview of changes in simple-scan 2.31.1
 
  * Compile with -DGSEAL_ENABLE
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 828bdf5..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,2153 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-         [return !ngettext ("","", 1)],
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        	[AC_TRY_LINK([
-#include <libintl.h>
-],
-	          [return !dgettext ("","")],
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	])
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, ngettext,
-		    [AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)])])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-  	  AC_CHECK_LIB(intl, ngettext,
-          	[AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)],
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  MSGFMT_OPTS=
-	  AC_MSG_CHECKING([if msgfmt accepts -c])
-	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-	  AC_SUBST(MSGFMT_OPTS)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-# 
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
-  m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
-# gnome-common.m4
-# 
-
-dnl GNOME_COMMON_INIT
-
-AC_DEFUN([GNOME_COMMON_INIT],
-[
-  dnl this macro should come after AC_CONFIG_MACRO_DIR
-  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
-  dnl ensure that when the Automake generated makefile calls aclocal,
-  dnl it honours the $ACLOCAL_FLAGS environment variable
-  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-  if test -n "$ac_macro_dir"; then
-    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-  fi
-
-  AC_SUBST([ACLOCAL_AMFLAGS])
-])
-
-AC_DEFUN([GNOME_DEBUG_CHECK],
-[
-	AC_ARG_ENABLE([debug],
-                      AC_HELP_STRING([--enable-debug],
-                                     [turn on debugging]),,
-                      [enable_debug=no])
-
-	if test x$enable_debug = xyes ; then
-	    AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-		[Enable additional debugging at the expense of performance and size])
-	fi
-])
-
-dnl GNOME_MAINTAINER_MODE_DEFINES ()
-dnl define DISABLE_DEPRECATED
-dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-[
-	AC_REQUIRE([AM_MAINTAINER_MODE])
-
-	DISABLE_DEPRECATED=""
-	if test $USE_MAINTAINER_MODE = yes; then
-	        DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-	        for DOMAIN in $DOMAINS; do
-	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-	        done
-	fi
-
-	AC_SUBST(DISABLE_DEPRECATED)
-])
-
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GXX" != xyes; then
-    enable_cxx_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
-dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-AC_DEFUN([GNOME_DOC_DEFINES],
-[
-AC_ARG_WITH([help-dir],
-  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-  [with_help_dir='${datadir}/gnome/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_WITH([omf-dir],
-  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-  [with_omf_dir='${datadir}/omf'])
-OMF_DIR="$with_omf_dir"
-AC_SUBST(OMF_DIR)
-
-AC_ARG_WITH([help-formats],
-  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-  [with_help_formats=''])
-DOC_USER_FORMATS="$with_help_formats"
-AC_SUBST(DOC_USER_FORMATS)
-
-AC_ARG_ENABLE([scrollkeeper],
-	[AC_HELP_STRING([--disable-scrollkeeper],
-			[do not make updates to the scrollkeeper database])],,
-	enable_scrollkeeper=yes)
-AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-
-dnl disable scrollkeeper automatically for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-])
-
-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-AC_DEFUN([GNOME_DOC_INIT],
-[AC_REQUIRE([AC_PROG_LN_S])dnl
-
-ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	AC_MSG_RESULT([yes])
-	ifelse([$2],,[:],[$2])
-else
-	AC_MSG_RESULT([no])
-	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-fi
-
-GNOME_DOC_DEFINES
-])
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-AC_DIAGNOSE([obsolete], [$0:
-	your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
-	`ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
-	you adjust the code.  You can also remove the above call to
-	AC_PROG_CC if you already called it elsewhere.])
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-])
-AU_DEFUN([fp_PROG_CC_STDC])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/configure b/configure
deleted file mode 100755
index 0a898a7..0000000
--- a/configure
+++ /dev/null
@@ -1,8161 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="configure.ac"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-MKINSTALLDIRS
-POSUB
-POFILES
-PO_IN_DATADIR_FALSE
-PO_IN_DATADIR_TRUE
-INTLLIBS
-INSTOBJEXT
-GMOFILES
-CATOBJEXT
-CATALOGS
-MSGFMT_OPTS
-GETTEXT_PACKAGE
-DATADIRNAME
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
-MSGMERGE
-XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
-USE_NLS
-HAVE_GNOME_DOC_UTILS_FALSE
-HAVE_GNOME_DOC_UTILS_TRUE
-DISTCHECK_CONFIGURE_FLAGS
-ENABLE_SK_FALSE
-ENABLE_SK_TRUE
-DOC_USER_FORMATS
-OMF_DIR
-HELP_DIR
-LN_S
-SIMPLE_SCAN_LIBS
-SIMPLE_SCAN_CFLAGS
-PKG_CONFIG
-WARN_CFLAGS
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-EGREP
-GREP
-CPP
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-DISABLE_DEPRECATED
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-enable_silent_rules
-enable_dependency_tracking
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
-enable_compile_warnings
-enable_iso_c
-with_help_dir
-with_omf_dir
-with_help_formats
-enable_scrollkeeper
-enable_nls
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-SIMPLE_SCAN_CFLAGS
-SIMPLE_SCAN_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-schemas-install
-                          Disable the schemas installation
-  --enable-compile-warnings=[no/minimum/yes/maximum/error]
-                          Turn on compiler warnings
-  --enable-iso-c          Try to warn if code is not ISO C
-  --disable-scrollkeeper  do not make updates to the scrollkeeper database
-  --disable-nls           do not use Native Language Support
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gconf-source=sourceaddress
-                          Config database for installing schema files.
-  --with-gconf-schema-file-dir=dir
-                          Directory for installing schema files.
-  --with-help-dir=DIR     path to help docs
-  --with-omf-dir=DIR      path to OMF files
-  --with-help-formats=FORMATS
-                          list of formats
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  SIMPLE_SCAN_CFLAGS
-              C compiler flags for SIMPLE_SCAN, overriding pkg-config
-  SIMPLE_SCAN_LIBS
-              linker flags for SIMPLE_SCAN, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=simple-scan
- VERSION=2.31.1
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-
-
-	DISABLE_DEPRECATED=""
-	if test $USE_MAINTAINER_MODE = yes; then
-	        DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-	        for DOMAIN in $DOMAINS; do
-	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-	        done
-	fi
-
-
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-AM_BACKSLASH='\'
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then :
-
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
-  # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
-  enableval=$enable_schemas_install; case ${enableval} in
-       yes|no) ;;
-       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-      esac
-fi
-
-   if test "$enable_schemas_install" != no; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-
-
-
-
-    # Check whether --enable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then :
-  enableval=$enable_compile_warnings;
-else
-  enable_compile_warnings="yes"
-fi
-
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
-$as_echo_n "checking whether gcc understands $option... " >&6; }
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  has_option=yes
-else
-  has_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-		CFLAGS="$SAVE_CFLAGS"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
-$as_echo "$has_option" >&6; }
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
-$as_echo "$warning_flags" >&6; }
-
-    # Check whether --enable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then :
-  enableval=$enable_iso_c;
-else
-  enable_iso_c=no
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *\ \	-ansi\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *\ \	-pedantic\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
-$as_echo "$complCFLAGS" >&6; }
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIMPLE_SCAN" >&5
-$as_echo_n "checking for SIMPLE_SCAN... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SIMPLE_SCAN_CFLAGS"; then
-        pkg_cv_SIMPLE_SCAN_CFLAGS="$SIMPLE_SCAN_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SIMPLE_SCAN_CFLAGS=`$PKG_CONFIG --cflags "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SIMPLE_SCAN_LIBS"; then
-        pkg_cv_SIMPLE_SCAN_LIBS="$SIMPLE_SCAN_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SIMPLE_SCAN_LIBS=`$PKG_CONFIG --libs "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-"`
-        else
-	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SIMPLE_SCAN_PKG_ERRORS" >&5
-
-	as_fn_error "Package requirements (
-    gtk+-2.0
-    gconf-2.0
-    gmodule-export-2.0
-    gthread-2.0
-    cairo
-    gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
-    gudev-1.0
-) were not met:
-
-$SIMPLE_SCAN_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SIMPLE_SCAN_CFLAGS
-and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SIMPLE_SCAN_CFLAGS
-and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
-else
-	SIMPLE_SCAN_CFLAGS=$pkg_cv_SIMPLE_SCAN_CFLAGS
-	SIMPLE_SCAN_LIBS=$pkg_cv_SIMPLE_SCAN_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in sane/sane.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SANE_SANE_H 1
-_ACEOF
-
-else
-  as_fn_error "SANE not found" "$LINENO" 5
-fi
-
-done
-
-for ac_header in sane/saneopts.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sane/saneopts.h" "ac_cv_header_sane_saneopts_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_saneopts_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SANE_SANEOPTS_H 1
-_ACEOF
-
-else
-  as_fn_error "SANE not found" "$LINENO" 5
-fi
-
-done
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-
-gdu_cv_version_required=0.3.2
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
-if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  gdu_cv_have_gdu=yes
-else
-  gdu_cv_have_gdu=no
-fi
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
-fi
-
-
-
-# Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then :
-  withval=$with_help_dir;
-else
-  with_help_dir='${datadir}/gnome/help'
-fi
-
-HELP_DIR="$with_help_dir"
-
-
-
-# Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then :
-  withval=$with_omf_dir;
-else
-  with_omf_dir='${datadir}/omf'
-fi
-
-OMF_DIR="$with_omf_dir"
-
-
-
-# Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then :
-  withval=$with_help_formats;
-else
-  with_help_formats=''
-fi
-
-DOC_USER_FORMATS="$with_help_formats"
-
-
-# Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then :
-  enableval=$enable_scrollkeeper;
-else
-  enable_scrollkeeper=yes
-fi
-
- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-  ENABLE_SK_TRUE=
-  ENABLE_SK_FALSE='#'
-else
-  ENABLE_SK_TRUE='#'
-  ENABLE_SK_FALSE=
-fi
-
-
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-
-
- if test "$gdu_cv_have_gdu" = "yes"; then
-  HAVE_GNOME_DOC_UTILS_TRUE=
-  HAVE_GNOME_DOC_UTILS_FALSE='#'
-else
-  HAVE_GNOME_DOC_UTILS_TRUE='#'
-  HAVE_GNOME_DOC_UTILS_FALSE=
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "0.35.0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
-$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
-fi
-
-# Extract the first word of "intltool-update", so it can be a program name with args.
-set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_UPDATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_MERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_EXTRACT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check the gettext tools to make sure they are GNU
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-GETTEXT_PACKAGE=simple-scan
-
-
-   for ac_header in locale.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LOCALE_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test $ac_cv_header_locale_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
-$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_val_LC_MESSAGES=yes
-else
-  am_cv_val_LC_MESSAGES=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-    if test $am_cv_val_LC_MESSAGES = yes; then
-
-$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-
-    fi
-  fi
-     USE_NLS=yes
-
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
-  gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
-$as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-
-int
-main ()
-{
-return !ngettext ("","", 1)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_ngettext_libc=yes
-else
-  gt_cv_func_ngettext_libc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
-$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-
-int
-main ()
-{
-return !dgettext ("","")
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_dgettext_libc=yes
-else
-  gt_cv_func_dgettext_libc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-      fi
-
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        for ac_func in bind_textdomain_codeset
-do :
-  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
-
-fi
-done
-
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bindtextdomain ();
-int
-main ()
-{
-return bindtextdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_bindtextdomain=yes
-else
-  ac_cv_lib_intl_bindtextdomain=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ngettext ();
-int
-main ()
-{
-return ngettext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_ngettext=yes
-else
-  ac_cv_lib_intl_ngettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
-$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dgettext ();
-int
-main ()
-{
-return dgettext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_dgettext=yes
-else
-  ac_cv_lib_intl_dgettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
-  gt_cv_func_dgettext_libintl=yes
-fi
-
-fi
-
-fi
-
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ngettext ();
-int
-main ()
-{
-return ngettext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_ngettext=yes
-else
-  ac_cv_lib_intl_ngettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
-$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dcgettext ();
-int
-main ()
-{
-return dcgettext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_dcgettext=yes
-else
-  ac_cv_lib_intl_dcgettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-  gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv
-else
-  :
-fi
-
-else
-  :
-fi
-
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          for ac_func in bind_textdomain_codeset
-do :
-  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
-
-fi
-done
-
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-
-      if test "$gt_cv_have_gettext" = "yes"; then
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
-	# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  for ac_func in dcgettext
-do :
-  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
-
-fi
-done
-
-	  MSGFMT_OPTS=
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-	  cat >conftest.foo <<_ACEOF
-
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-_ACEOF
-if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
-  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-echo "$as_me: failed input was:" >&5
-sed 's/^/| /' conftest.foo >&5
-fi
-
-	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	  # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  CATOBJEXT=.gmo
-             DATADIRNAME=share
-else
-  case $host in
-	    *-*-solaris*)
-	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-  CATOBJEXT=.gmo
-               DATADIRNAME=share
-else
-  CATOBJEXT=.mo
-               DATADIRNAME=lib
-fi
-
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-
-fi
-
-
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    fi
-
-        if test "$XGETTEXT" != ":"; then
-                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    ac_config_commands="$ac_config_commands default-1"
-
-
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-
-
-
-
-
-
-
-
-
-
-
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-$as_echo_n "checking for catalogs to be installed... " >&6; }
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-$as_echo "$LINGUAS" >&6; }
-     fi
-
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-            MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-
-
-         test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-
-
-
-ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile help/Makefile po/Makefile.in src/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
-t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  as_fn_error "conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r po/POTFILES
-	  }
-	 ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/configure.ac b/configure.ac
index ab2b8b9..3d5a225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(simple-scan, 2.31.1)
+AM_INIT_AUTOMAKE(simple-scan, 2.31.4)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -13,7 +13,7 @@ AC_HEADER_STDC
 
 AM_GCONF_SOURCE_2
 
-GNOME_COMPILE_WARNINGS(yes)
+GNOME_COMPILE_WARNINGS(maximum)
 
 dnl ###########################################################################
 dnl Dependencies
@@ -23,11 +23,14 @@ dnl Run-time dependencies:
 dnl * gnome-icon-theme
 dnl * xdg-utils (for xdg-email)
 
+GTK_REQUIRED=2.18.0
+
 PKG_CHECK_MODULES(SIMPLE_SCAN, [
-    gtk+-2.0
+    gtk+-2.0 >= $GTK_REQUIRED
     gconf-2.0
     gmodule-export-2.0
     gthread-2.0
+    zlib
     cairo
     gdk-pixbuf-2.0
     cairo-pdf
@@ -37,6 +40,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
 
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
 AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
+AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
 
 dnl ###########################################################################
 dnl Documentation
diff --git a/data/Makefile.in b/data/Makefile.in
deleted file mode 100644
index 1f1c98c..0000000
--- a/data/Makefile.in
+++ /dev/null
@@ -1,721 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" \
-	"$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"
-NROFF = nroff
-MANS = $(man1_MANS)
-DATA = $(schema_DATA) $(ui_DATA) $(utilities_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = icons
-uidir = $(datadir)/simple-scan
-ui_DATA = simple-scan.ui
-utilitiesdir = $(datadir)/applications
-utilities_in_files = simple-scan.desktop.in
-utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = simple-scan.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-man1_MANS = simple-scan.1
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS)
-DISTCLEANFILES = \
-	Makefile.in \
-	$(schema_DATA) \
-	$(utilities_DATA)
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu data/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-man1: $(man1_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-schemaDATA: $(schema_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
-	done
-
-uninstall-schemaDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(schemadir)" && rm -f $$files
-install-uiDATA: $(ui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
-	done
-
-uninstall-uiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(uidir)" && rm -f $$files
-install-utilitiesDATA: $(utilities_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(utilitiesdir)" || $(MKDIR_P) "$(DESTDIR)$(utilitiesdir)"
-	@list='$(utilities_DATA)'; test -n "$(utilitiesdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utilitiesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(utilitiesdir)" || exit $$?; \
-	done
-
-uninstall-utilitiesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(utilities_DATA)'; test -n "$(utilitiesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(utilitiesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(utilitiesdir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(MANS) $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-man install-schemaDATA install-uiDATA \
-	install-utilitiesDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-man uninstall-schemaDATA uninstall-uiDATA \
-	uninstall-utilitiesDATA
-
-uninstall-man: uninstall-man1
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-schemaDATA install-strip install-uiDATA \
-	install-utilitiesDATA installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am uninstall-man \
-	uninstall-man1 uninstall-schemaDATA uninstall-uiDATA \
-	uninstall-utilitiesDATA
-
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
deleted file mode 100644
index 97688ce..0000000
--- a/data/icons/Makefile.in
+++ /dev/null
@@ -1,384 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-icons = \
-	hicolor_actions_16x16_object-crop.png \
-	hicolor_actions_22x22_object-crop.png \
-	hicolor_actions_24x24_object-crop.png \
-	hicolor_actions_32x32_object-crop.png \
-	hicolor_actions_48x48_object-crop.png \
-	hicolor_actions_scalable_object-crop.svg
-
-EXTRA_DIST = $(icons)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu data/icons/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
-
-
-install-data-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		$(mkdir_p) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-uninstall-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index 1f799be..25bf23b 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -102,6 +102,7 @@
                       <object class="GtkImageMenuItem" id="save_menuitem">
                         <property name="label">gtk-save</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -109,6 +110,17 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="save_as_menuitem">
+                        <property name="label">gtk-save-as</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK|GDK_CONTROL_MASK"/>
+                        <signal name="activate" handler="save_as_file_button_clicked_cb"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="email_menuitem">
                         <property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
                         <property name="visible">True</property>
@@ -381,6 +393,7 @@
             <child>
               <object class="GtkToolButton" id="save_toolbutton">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes">Save</property>
diff --git a/depcomp b/depcomp
deleted file mode 100755
index df8eea7..0000000
--- a/depcomp
+++ /dev/null
@@ -1,630 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
deleted file mode 100644
index 97fd549..0000000
--- a/gnome-doc-utils.make
+++ /dev/null
@@ -1,655 +0,0 @@
-# gnome-doc-utils.make - make magic for building documentation
-# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-################################################################################
-## @@ Generating Header Files
-
-## @ DOC_H_FILE
-## The name of the header file to generate
-DOC_H_FILE ?=
-
-## @ DOC_H_DOCS
-## The input DocBook files for generating the header file
-DOC_H_DOCS ?=
-
-$(DOC_H_FILE): $(DOC_H_DOCS);
-	@rm -f $@.tmp; touch $@.tmp;
-	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-	done | sort | uniq \
-	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
-	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-	echo '	NULL' >> $@.tmp
-	echo '};' >> $@.tmp
-	echo >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
-	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
-	  echo $$xmlpath; \
-	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-	  for id in $$ids; do \
-	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
-	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-	  done; \
-	  echo >> $@.tmp; \
-	done;
-	cp $@.tmp $@ && rm -f $@.tmp
-
-dist-check-gdu:
-if !HAVE_GNOME_DOC_UTILS
-	@echo "*** GNOME Doc Utils must be installed in order to make dist"
-	@false
-endif
-
-.PHONY: dist-doc-header
-dist-doc-header: $(DOC_H_FILE)
-	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
-	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-
-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-
-.PHONY: clean-doc-header
-_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-clean-local: $(_clean_doc_header)
-distclean-local: $(_clean_doc_header)
-mostlyclean-local: $(_clean_doc_header)
-maintainer-clean-local: $(_clean_doc_header)
-clean-doc-header:
-	rm -f $(DOC_H_FILE)
-
-all: $(DOC_H_FILE)
-
-
-################################################################################
-## @@ Generating Documentation Files
-
-## @ DOC_MODULE
-## The name of the document being built
-DOC_MODULE ?=
-
-## @ DOC_ID
-## The unique identifier for a Mallard document
-DOC_ID ?=
-
-## @ DOC_PAGES
-## Page files in a Mallard document
-DOC_PAGES ?=
-
-## @ DOC_ENTITIES
-## Files included with a SYSTEM entity
-DOC_ENTITIES ?=
-
-## @ DOC_INCLUDES
-## Files included with XInclude
-DOC_INCLUDES ?=
-
-## @ DOC_FIGURES
-## Figures and other external data
-DOC_FIGURES ?=
-
-## @ DOC_FORMATS
-## The default formats to be built and installed
-DOC_FORMATS ?= docbook
-_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-
-## @ DOC_LINGUAS
-## The languages this document is translated into
-DOC_LINGUAS ?=
-_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
-	$(DOC_LINGUAS))
-
-_DOC_ABS_SRCDIR = @abs_srcdir@
-
-
-################################################################################
-## Variables for Bootstrapping
-
-_xml2po ?= `which xml2po`
-_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-
-if ENABLE_SK
-_ENABLE_SK = true
-_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
-
-
-################################################################################
-## @@ Rules for OMF Files
-
-db2omf_args =									\
-	--stringparam db2omf.basename $(DOC_MODULE)				\
-	--stringparam db2omf.format $(3)					\
-	--stringparam db2omf.dtd						\
-	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
-		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
-	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
-	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
-	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
-	$(if $(_ENABLE_SK),							\
-	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
-	$(_db2omf) $(2)
-
-## @ _DOC_OMF_IN
-## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-
-## @ _DOC_OMF_DB
-## The OMF files for DocBook output
-_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-
-$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_HTML
-## The OMF files for HTML output
-_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-
-$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-if ENABLE_SK
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-endif
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_ALL
-## All OMF output files to be built
-# FIXME
-_DOC_OMF_ALL =									\
-	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-
-.PHONY: omf
-omf: $(_DOC_OMF_ALL)
-
-
-################################################################################
-## @@ C Locale Documents
-
-## @ _DOC_C_MODULE
-## The top-level documentation file in the C locale
-_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-## @ _DOC_C_PAGES
-## Page files in a Mallard document in the C locale
-_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-
-## @ _DOC_C_ENTITIES
-## Files included with a SYSTEM entity in the C locale
-_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-
-## @ _DOC_C_XINCLUDES
-## Files included with XInclude in the C locale
-_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-
-## @ _DOC_C_DOCS
-## All documentation files in the C locale
-_DOC_C_DOCS =								\
-	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
-
-## @ _DOC_C_DOCS_NOENT
-## All documentation files in the C locale,
-## except files included with a SYSTEM entity
-_DOC_C_DOCS_NOENT =							\
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)
-
-## @ _DOC_C_FIGURES
-## All figures and other external data in the C locale
-_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
-	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-
-## @ _DOC_C_HTML
-## All HTML documentation in the C locale
-# FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(foreach f,						\
-	$(shell xsltproc --xinclude 					\
-	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
-	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
-	C/$(f).xhtml)
-
-###############################################################################
-## @@ Other Locale Documentation
-
-## @ _DOC_POFILES
-## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
-.PHONY: po
-po: $(_DOC_POFILES)
-
-## @ _DOC_MOFILES
-## The .mo files used for translating the document
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
-## @ _DOC_LC_MODULES
-## The top-level documentation files in all other locales
-_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-## @ _DOC_LC_PAGES
-## Page files in a Mallard document in all other locales
-_DOC_LC_PAGES =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
-		$(lc)/$(notdir $(page)) ))
-
-## @ _DOC_LC_XINCLUDES
-## Files included with XInclude in all other locales
-_DOC_LC_INCLUDES =								\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
-		$(lc)/$(notdir $(inc)) ))
-
-## @ _DOC_LC_HTML
-## All HTML documentation in all other locales
-# FIXME: probably have to shell escape to determine the file names
-_DOC_LC_HTML =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
-		$(lc)/$(notdir $(doc)) ))
-
-## @ _DOC_LC_DOCS
-## All documentation files in all other locales
-_DOC_LC_DOCS =									\
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
-## @ _DOC_LC_FIGURES
-## All figures and other external data in all other locales
-_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-
-_DOC_SRC_FIGURES =								\
-	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
-		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-
-$(_DOC_POFILES):
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	@if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  echo "cp $(srcdir)/$@ $@"; \
-	  cp "$(srcdir)/$@" "$@"; \
-	fi;
-	@docs=; \
-	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
-	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
-	done; \
-	if ! test -f $@; then \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
-	else \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
-	fi
-
-$(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
-
-# FIXME: fix the dependancy
-# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
-	(cd $(dir $@) && \
-	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
-	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-## @ _DOC_POT
-## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
-.PHONY: pot
-pot: $(_DOC_POT)
-$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
-################################################################################
-## @@ All Documentation
-
-## @ _DOC_HTML_ALL
-## All HTML documentation, only if it's built
-_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
-	$(_DOC_C_HTML) $(_DOC_LC_HTML))
-
-_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-
-$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-
-
-################################################################################
-## All
-
-all:							\
-	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
-	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
-	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
-
-
-################################################################################
-## Clean
-
-.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
-clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-clean-doc-lc:
-	rm -f $(_DOC_LC_DOCS)
-	rm -f $(_DOC_MOFILES)
-	@list='$(_DOC_POFILES)'; for po in $$list; do \
-	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
-	    echo "rm -f $$po"; \
-	    rm -f "$$po"; \
-	  fi; \
-	done
-#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc/.xml2po.mo"; then \
-	    echo "rm -f $$lc/.xml2po.mo"; \
-	    rm -f "$$lc/.xml2po.mo"; \
-	  fi; \
-	done
-clean-doc-dir: clean-doc-lc
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  for dir in `find $$lc -depth -type d`; do \
-	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-	      echo "rmdir $$dir"; \
-	      rmdir "$$dir"; \
-	   fi; \
-	  done; \
-	done
-
-_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-_clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
-clean-local:						\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-distclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-mostlyclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-maintainer-clean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-
-
-
-################################################################################
-## Dist
-
-.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 						\
-	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
-	$(if $(_DOC_OMF_IN),dist-doc-omf)
-#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
-	  $(mkinstalldirs) "$(distdir)/$$lc"; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
-	for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$docdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
-	    fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
-	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
-	done
-
-dist-doc-figs: $(_DOC_SRC_FIGURES)
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
-	for fig in $$list; do \
-	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$fig"; then \
-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$figdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
-	    fi; \
-	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
-	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
-	  fi; \
-	done;
-
-dist-doc-omf:
-	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-
-dist-doc-dsk:
-	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-
-################################################################################
-## Check
-
-.PHONY: check-doc-docs check-doc-omf
-check:							\
-	$(if $(DOC_MODULE),check-doc-docs)		\
-	$(if $(DOC_ID),check-doc-pages)			\
-	$(if $(_DOC_OMF_IN),check-doc-omf)
-
-check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
-	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
-	done
-
-check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-	for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-check-doc-omf: $(_DOC_OMF_ALL)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-	done
-
-
-
-################################################################################
-## Install
-
-.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-
-_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-
-install-data-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),install-doc-html)		\
-	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
-	$(if $(_DOC_OMF_IN),install-doc-omf)
-#	$(if $(_DOC_DSK_IN),install-doc-dsk)
-
-install-doc-docs:
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
-	  if ! test -d "$$docdir"; then \
-	    echo "$(mkinstalldirs) $$docdir"; \
-	    $(mkinstalldirs) "$$docdir"; \
-	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
-	done
-
-install-doc-figs:
-	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
-	  for lc in C $(_DOC_REAL_LINGUAS); do \
-	    figsymlink=false; \
-	    if test -f "$$lc/$$fig"; then \
-	      figfile="$$lc/$$fig"; \
-	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
-	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    else \
-	      figsymlink=true; \
-	    fi; \
-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
-	    if ! test -d "$$figdir"; then \
-	      echo "$(mkinstalldirs) $$figdir"; \
-	      $(mkinstalldirs) "$$figdir"; \
-	    fi; \
-	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    if $$figsymlink; then \
-	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-	    else \
-	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-	    fi; \
-	  done; \
-	done
-
-install-doc-html:
-	echo install-html
-
-install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
-	done
-	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	fi;
-
-install-doc-dsk:
-	echo install-dsk
-
-
-
-################################################################################
-## Uninstall
-
-.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-uninstall-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
-	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
-	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-
-uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	done
-
-uninstall-doc-figs:
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	done;
-
-uninstall-doc-omf:
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	done
diff --git a/help/Makefile.in b/help/Makefile.in
deleted file mode 100644
index eee46d3..0000000
--- a/help/Makefile.in
+++ /dev/null
@@ -1,934 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# gnome-doc-utils.make - make magic for building documentation
-# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-################################################################################
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/gnome-doc-utils.make
-subdir = help
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
-	$(DOC_LINGUAS))
-
-_DOC_ABS_SRCDIR = @abs_srcdir@
-_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-@ENABLE_SK_TRUE@_ENABLE_SK = true
-
-################################################################################
-db2omf_args = \
-	--stringparam db2omf.basename $(DOC_MODULE)				\
-	--stringparam db2omf.format $(3)					\
-	--stringparam db2omf.dtd						\
-	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
-		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
-	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
-	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
-	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
-	$(if $(_ENABLE_SK),							\
-	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
-	$(_db2omf) $(2)
-
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-
-_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-
-
-# FIXME
-_DOC_OMF_ALL = \
-	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-
-
-################################################################################
-_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-_DOC_C_DOCS = \
-	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
-
-_DOC_C_DOCS_NOENT = \
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)
-
-_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
-	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-
-
-# FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(foreach f,						\
-	$(shell xsltproc --xinclude 					\
-	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
-	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
-	C/$(f).xhtml)
-
-
-###############################################################################
-_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-_DOC_LC_PAGES = \
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
-		$(lc)/$(notdir $(page)) ))
-
-_DOC_LC_INCLUDES = \
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
-		$(lc)/$(notdir $(inc)) ))
-
-
-# FIXME: probably have to shell escape to determine the file names
-_DOC_LC_HTML = \
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
-		$(lc)/$(notdir $(doc)) ))
-
-_DOC_LC_DOCS = \
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
-_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-
-_DOC_SRC_FIGURES = \
-	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
-		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
-
-################################################################################
-_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
-	$(_DOC_C_HTML) $(_DOC_LC_HTML))
-
-_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-DOC_ID = simple-scan
-DOC_INCLUDES = legal.xml
-DOC_FIGURES = 
-DOC_PAGES = index.page \
-            adf.page \
-            crop.page \
-            dpi.page \
-            edit.page \
-            email.page \
-            print.page \
-            rotate.page \
-            save.page \
-            scanner.page \
-            scanning.page
-
-DOC_LINGUAS = 
-DISTCLEANFILES = \
-	Makefile.in
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu help/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-local
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-local \
-	dist-hook distclean distclean-generic distclean-local distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-local pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
-
-
-DOC_H_FILE ?=
-
-DOC_H_DOCS ?=
-
-$(DOC_H_FILE): $(DOC_H_DOCS);
-	@rm -f $@.tmp; touch $@.tmp;
-	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-	done | sort | uniq \
-	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
-	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-	echo '	NULL' >> $@.tmp
-	echo '};' >> $@.tmp
-	echo >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
-	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
-	  echo $$xmlpath; \
-	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-	  for id in $$ids; do \
-	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
-	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-	  done; \
-	  echo >> $@.tmp; \
-	done;
-	cp $@.tmp $@ && rm -f $@.tmp
-
-dist-check-gdu:
-@HAVE_GNOME_DOC_UTILS_FALSE@	@echo "*** GNOME Doc Utils must be installed in order to make dist"
-@HAVE_GNOME_DOC_UTILS_FALSE@	@false
-
-.PHONY: dist-doc-header
-dist-doc-header: $(DOC_H_FILE)
-	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
-	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-
-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-
-.PHONY: clean-doc-header
-clean-local: $(_clean_doc_header)
-distclean-local: $(_clean_doc_header)
-mostlyclean-local: $(_clean_doc_header)
-maintainer-clean-local: $(_clean_doc_header)
-clean-doc-header:
-	rm -f $(DOC_H_FILE)
-
-all: $(DOC_H_FILE)
-
-################################################################################
-
-DOC_MODULE ?=
-
-DOC_ID ?=
-
-DOC_PAGES ?=
-
-DOC_ENTITIES ?=
-
-DOC_INCLUDES ?=
-
-DOC_FIGURES ?=
-
-DOC_FORMATS ?= docbook
-
-DOC_LINGUAS ?=
-
-################################################################################
-
-_xml2po ?= `which xml2po`
-
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-@ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-@ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-
-$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-
-$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-@ENABLE_SK_TRUE@	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-@ENABLE_SK_TRUE@	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
-@ENABLE_SK_TRUE@	  echo "Please check your ScrollKeeper installation." >&2;		\
-@ENABLE_SK_TRUE@	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-
-.PHONY: omf
-omf: $(_DOC_OMF_ALL)
-
-.PHONY: po
-po: $(_DOC_POFILES)
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
-$(_DOC_POFILES):
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	@if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  echo "cp $(srcdir)/$@ $@"; \
-	  cp "$(srcdir)/$@" "$@"; \
-	fi;
-	@docs=; \
-	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
-	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
-	done; \
-	if ! test -f $@; then \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
-	else \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
-	fi
-
-$(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
-
-# FIXME: fix the dependancy
-# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
-	(cd $(dir $@) && \
-	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
-	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-.PHONY: pot
-pot: $(_DOC_POT)
-$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-
-################################################################################
-
-all:							\
-	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
-	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
-	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
-
-################################################################################
-
-.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
-clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-clean-doc-lc:
-	rm -f $(_DOC_LC_DOCS)
-	rm -f $(_DOC_MOFILES)
-	@list='$(_DOC_POFILES)'; for po in $$list; do \
-	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
-	    echo "rm -f $$po"; \
-	    rm -f "$$po"; \
-	  fi; \
-	done
-#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc/.xml2po.mo"; then \
-	    echo "rm -f $$lc/.xml2po.mo"; \
-	    rm -f "$$lc/.xml2po.mo"; \
-	  fi; \
-	done
-clean-doc-dir: clean-doc-lc
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  for dir in `find $$lc -depth -type d`; do \
-	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-	      echo "rmdir $$dir"; \
-	      rmdir "$$dir"; \
-	   fi; \
-	  done; \
-	done
-
-clean-local:						\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-distclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-mostlyclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-maintainer-clean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-
-################################################################################
-
-.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 						\
-	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
-	$(if $(_DOC_OMF_IN),dist-doc-omf)
-#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
-	  $(mkinstalldirs) "$(distdir)/$$lc"; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
-	for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$docdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
-	    fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
-	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
-	done
-
-dist-doc-figs: $(_DOC_SRC_FIGURES)
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
-	for fig in $$list; do \
-	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$fig"; then \
-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$figdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
-	    fi; \
-	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
-	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
-	  fi; \
-	done;
-
-dist-doc-omf:
-	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-
-dist-doc-dsk:
-	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-################################################################################
-
-.PHONY: check-doc-docs check-doc-omf
-check:							\
-	$(if $(DOC_MODULE),check-doc-docs)		\
-	$(if $(DOC_ID),check-doc-pages)			\
-	$(if $(_DOC_OMF_IN),check-doc-omf)
-
-check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
-	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
-	done
-
-check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-	for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-check-doc-omf: $(_DOC_OMF_ALL)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-	done
-
-################################################################################
-
-.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-
-install-data-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),install-doc-html)		\
-	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
-	$(if $(_DOC_OMF_IN),install-doc-omf)
-#	$(if $(_DOC_DSK_IN),install-doc-dsk)
-
-install-doc-docs:
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
-	  if ! test -d "$$docdir"; then \
-	    echo "$(mkinstalldirs) $$docdir"; \
-	    $(mkinstalldirs) "$$docdir"; \
-	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
-	done
-
-install-doc-figs:
-	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
-	  for lc in C $(_DOC_REAL_LINGUAS); do \
-	    figsymlink=false; \
-	    if test -f "$$lc/$$fig"; then \
-	      figfile="$$lc/$$fig"; \
-	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
-	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    else \
-	      figsymlink=true; \
-	    fi; \
-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
-	    if ! test -d "$$figdir"; then \
-	      echo "$(mkinstalldirs) $$figdir"; \
-	      $(mkinstalldirs) "$$figdir"; \
-	    fi; \
-	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    if $$figsymlink; then \
-	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-	    else \
-	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-	    fi; \
-	  done; \
-	done
-
-install-doc-html:
-	echo install-html
-
-install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
-	done
-	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	fi;
-
-install-doc-dsk:
-	echo install-dsk
-
-################################################################################
-
-.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-uninstall-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
-	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
-	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-
-uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	done
-
-uninstall-doc-figs:
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	done;
-
-uninstall-doc-omf:
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	done
-
-dist-hook: doc-dist-hook
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 6781b98..0000000
--- a/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/missing b/missing
deleted file mode 100755
index 28055d2..0000000
--- a/missing
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 4191a45..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index cc8a222..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# 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/af.po b/po/af.po
index 1ac1beb..adf9371 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,65 +554,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Jacques Botha https://launchpad.net/~jacquesb"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 4a3b893..b59c4a2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-19 09:51+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -412,27 +412,22 @@ msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "مستند ممسوح"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "فشل حفظ الملف"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -440,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -452,7 +447,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -467,68 +462,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة و تعمل"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "تعذر فتح معاين الصور"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "اختر _نوع الملف"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "فشل حفظ الملف"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "تعذر فتح معاين الصور"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -555,16 +570,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "عن \"المسح البسيط\""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -572,50 +587,60 @@ msgstr ""
 "  Khaled Hosny https://launchpad.net/~khaledhosny\n"
 "  benohb https://launchpad.net/~hamid"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "ملفات مفقودة"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "من فضلك تحقق من تثبيتك"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "غيّر _الماسحة"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "غيّر _الماسحة"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
diff --git a/po/ast.po b/po/ast.po
index a9f271a..ae289dc 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Fallu de comunicación col escáner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Falló al guardar el ficheru"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -436,7 +431,7 @@ msgstr ""
 "  %s [DEVICE...] - Scanning utility"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -448,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -473,68 +468,88 @@ msgstr ""
 "  --g-fatal-warnings              Facer que tolos avisos seyan fatales"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, 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.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -563,65 +578,75 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Iñigo Varela https://launchpad.net/~ivarela"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Ficheros non alcontraos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Por favor, comprueba la instalación"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
diff --git a/po/bg.po b/po/bg.po
index b576e1f..8c5a2eb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-27 20:56+0000\n"
 "Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -405,27 +405,22 @@ msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Неуспех при сканиране"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Неуспех при запазване на файл"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -435,7 +430,7 @@ msgstr ""
 "  %s [УСТРОЙСТВО...] - Инструмент за сканиране"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -447,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -462,68 +457,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Запазване като..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Неуспех при запазване на файл"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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 +555,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Относно Опростено сканиране"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -558,50 +573,60 @@ msgstr ""
 "  i.raynov https://launchpad.net/~ivaylo-raynov\n"
 "  Филип Андонов https://launchpad.net/~vonodna"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Липсващи файлове"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Моля проверете инсталацията си"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
diff --git a/po/ca.po b/po/ca.po
index 8225577..6a36e8d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-11 15:07+0000\n"
-"Last-Translator: David Planella <Unknown>\n"
+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -405,27 +405,22 @@ msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Ha fallat el desament del fitxer"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -435,7 +430,7 @@ msgstr ""
 "  %s [DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -447,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -471,68 +466,88 @@ msgstr ""
 "  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Ha fallat el desament del fitxer"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -549,67 +564,78 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  David Planella https://launchpad.net/~dpm\n"
+"  Sergi https://launchpad.net/~scaparrosj\n"
 "  Siegfried Gevatter https://launchpad.net/~rainct\n"
 "  pancake https://launchpad.net/~pancake"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
diff --git a/po/cs.po b/po/cs.po
index 5b31eb8..76c94a8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-10 15:06+0000\n"
 "Last-Translator: Adrian Guniš <andygun696@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -416,27 +416,22 @@ msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Při komunikaci se skenerem došlo k chybě"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Skenovaný dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Uložení souboru selhalo"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -446,7 +441,7 @@ msgstr ""
 "  %s [ZAŘÍZENÍ...] - Skenovací nástroj"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -464,7 +459,7 @@ msgstr ""
 "  --help-gtk                      Zobrazit přepínače GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -488,68 +483,88 @@ msgstr ""
 "  --g-fatal-warnings              Všechna varování budou kritická"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Nelze otevřít aplikaci s náhledem obrázku"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Uložit jako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Zvolit _typ souboru"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Uložení souboru selhalo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Nelze otevřít aplikaci s náhledem obrázku"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -579,16 +594,16 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,50 +612,60 @@ msgstr ""
 "  Petr Šimáček https://launchpad.net/~petr-simacek\n"
 "  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Soubory chybí"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Zkontrolujte prosím svoji instalaci"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Změnit _skener"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Změnit _skener"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
diff --git a/po/da.po b/po/da.po
index 882475b..efcef41 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-10 23:02+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-05-25 09:17+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Alle sider fra _arkføderen"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Bagside"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Beskær den markerede side"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Forside"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "For- og bagside"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Ny"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Sidestørrelse:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Gem"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Gem dokument som en fil"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "Skanner _kilde:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Skan side:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Mappe til at gemme filer i"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Højde af papir i tiendedele millimeter"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Højde af skannet billede i pixel"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Papirside der skal skannes"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -337,11 +337,13 @@ msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "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'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -370,6 +372,8 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
+"papirstørelse)"
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -387,7 +391,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Bredde af papir i tiendedele millimeter"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -417,27 +421,22 @@ msgid "Unable to start scan"
 msgstr "Kunne ikke starte skanning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Fejl under kommunikation med skanner."
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Skannet dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Kunne ikke gemme fil"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -447,7 +446,7 @@ msgstr ""
 "  %s [ENHED...] - Skanningsværktøj"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -465,7 +464,7 @@ msgstr ""
 "  --help-gtk                      Vis tilvalg for GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -489,68 +488,88 @@ msgstr ""
 "  --g-fatal-warnings              Gør alle advarsler fatale"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er kræves for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Gem som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Alle filer"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Vælg fil_type"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Kunne ikke gemme fil"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Kunne ikke åbne hjælpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -579,16 +598,16 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Om Simpel Skanning"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokument skanningsværktøj"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -598,50 +617,60 @@ msgstr ""
 "  MadsRH https://launchpad.net/~madsrh\n"
 "  Niels Kjøller Hansen https://launchpad.net/~kjoller"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Filer mangler"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Kontrollér venligst din installation"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
diff --git a/po/de.po b/po/de.po
index 0ccd7d7..a5013b0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-03-18 19:46+0000\n"
-"Last-Translator: Daniel Schury <Surst@gmx.net>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-14 03:39+0000\n"
+"Last-Translator: Jochen Skulj <jochen@jochenskulj.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Alle Seiten aus dem _Papiereinzug"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Rückseite"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Die gewählte Seite zurecht schneiden"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Vorderseite"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Vorder- und Rückseite"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Neu"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Seitengröße:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Speichern"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Als Datei speichern"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "Scan-_Quelle:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Zu scannende Seite:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Papierhöhe in Zehntelmillimetern"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Höhe des gescannten Bilds in Pixel"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Zu scannende Seite des Blattes"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -339,11 +339,14 @@ 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/simple-scan.schemas.in.h:16
 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«."
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -371,6 +374,7 @@ 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/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -388,7 +392,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Seitenbreite in Zehntelmillimetern"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -418,27 +422,22 @@ msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Gescanntes Dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Datei konnte nicht gespeichert werden"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -448,7 +447,7 @@ msgstr ""
 "  %s [GERÄT...] - Scanwerkzeug"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -466,7 +465,7 @@ msgstr ""
 "  --help-gtk                      Zeigt GTK+-Optionen"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -490,70 +489,90 @@ msgstr ""
 "  --g-fatal-warnings              All Warnungen werden zu fatalen"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob ihr Scanner angeschlossen und eingeschaltet ist"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Speichern unter …"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Datei-_Typ auswählen"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -587,16 +606,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -619,50 +638,60 @@ msgstr ""
 "  staedtler-przyborski https://launchpad.net/~staedtler-przyborski\n"
 "  tlue https://launchpad.net/~tlueber"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Dateien nicht gefunden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Bitte überprüfen Sie Ihre Installation"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
diff --git a/po/el.po b/po/el.po
index d2909b4..9d16607 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-03-23 00:21+0000\n"
 "Last-Translator: Thanos Lefteris <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -421,27 +421,22 @@ msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Σαρωμένο"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Αποτυχία αποθήκευσης του αρχείου"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -451,7 +446,7 @@ msgstr ""
 "  %s [ΣΥΣΚΕΥΗ...] - Εφαρμογή σάρωσης"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -469,7 +464,7 @@ msgstr ""
 "  --help-gtk Εμφάνιση επιλογών GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -493,70 +488,90 @@ msgstr ""
 "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Επιλογή _τύπου αρχείου"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Αποτυχία αποθήκευσης του αρχείου"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -588,16 +603,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -605,50 +620,60 @@ msgstr ""
 "  Jennie Petoumenou https://launchpad.net/~jennie\n"
 "  Thanos Lefteris https://launchpad.net/~alefteris"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Λείπουν αρχεία"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Αλλαγή _σαρωτή"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Αλλαγή _σαρωτή"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9594736..8673cb7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-03-23 12:03+0000\n"
 "Last-Translator: Alex Denvir <coldfff@blueyonder.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -414,27 +414,22 @@ msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Error communicating with scanner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Scanned Document"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Failed to save file"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -444,7 +439,7 @@ msgstr ""
 "  %s [DEVICE...] - Scanning utility"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -462,7 +457,7 @@ msgstr ""
 "  --help-gtk                      Show GTK+ options"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -486,68 +481,88 @@ msgstr ""
 "  --g-fatal-warnings              Make all warnings fatal"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Unable to open image preview application"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Save As…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "All Files"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Select File _Type"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Failed to save file"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Unable to open image preview application"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -576,16 +591,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -594,50 +609,60 @@ msgstr ""
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
 "  solar.george https://launchpad.net/~solar.george"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Files missing"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Please check your installation"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Change _Scanner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Change _Scanner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 0000000..8485339
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,627 @@
+# Esperanto 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-05-06 02:34+0000\n"
+"Last-Translator: Leo Arias <yo@elopio.net>\n"
+"Language-Team: Esperanto <eo@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: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "Tranĉu"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "Nova"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "Foto"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr ""
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr ""
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:916
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 ""
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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 ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.c:200
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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/ui.c:1274
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Leo Arias https://launchpad.net/~elopio"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 9516d3c..58aa0de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-05-02 16:53+0000\n"
-"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-05-29 15:56+0000\n"
+"Last-Translator: Julián Alarcón <alarconj@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -146,7 +146,7 @@ msgstr "_Origen de escaneo:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr "Cara a escanar:"
+msgstr "Cara a escanear:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -423,27 +423,22 @@ msgid "Unable to start scan"
 msgstr "No empezar a escanear"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Error comunicándose con el escáner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Documento escaneado"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Falló al guardar el archivo"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -453,7 +448,7 @@ msgstr ""
 "  %s [DISPOSITIVO...] - utilidad de escaneo"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -471,7 +466,7 @@ msgstr ""
 "  --help-gtk                      Muestra opciones de GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -496,68 +491,88 @@ msgstr ""
 "  --g-fatal-warnings              Hacer que todos los avisos sean fatales"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Ningún escáner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "No se puede abrir la imagen previa de la aplicación"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Seleccione el _tipo de archivo"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "No se puede abrir la imagen previa de la aplicación"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -586,16 +601,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -620,50 +635,60 @@ msgstr ""
 "  felix.anadon@gmail.com https://launchpad.net/~felix-anadon\n"
 "  fosk https://launchpad.net/~oscarrdg"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Faltan archivos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Verifique su instalación"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Cambiar _escáner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr "Automático"
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Cambiar _escáner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 0000000..5eebb33
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,654 @@
+# Estonian 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-03-16 07:52+0000\n"
+"Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4 x 6 tolli"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "Kõik lehed _söötjast"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "Kärbi"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "Valitud lehekülje kärpimine"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "Uus"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "Foto"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "Eelistused"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "Vasakule pööramine"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "Paremale pööramine"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "Pööra _vasakule"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "Pööra _paremale"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Lehekülje pööramine vasakule (vastupäeva)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Lehekülje pööramine paremale (päripäeva)"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "Salvesta"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "Sk_annimine"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "Skaneeri"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "Skannimise _allikas:"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "Ühe lehekülje skannimine skannerist"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "Lihtne skannija"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "Üks _lehekülg"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "Uue dokumendi alustamine"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "Lõpeta"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "Selle skannimise lõpetamine"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "Tekst"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "_Autoriseeri"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "_Sisu"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "_Kärbi"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "_Kohandatud"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "_E-post"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "A_bi"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "_Puudub"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "_Lehekülg"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "_Parool:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "_Foto eraldusvõime:"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "_Pööramisega kärbe"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "_Lõpeta skannimine"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "_Teksti eraldusvõime:"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "_Kasutajanimi allika jaoks:"
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "Dokumentide skannimine"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "Seade, millest skannida"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "Skannimise suund"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "Kataloog, kuhu failid salvestada"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "Skannitud piltide kõrgus pikslites"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "Fotoskannide eraldusvõime"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "Tekstiskannide eraldusvõime"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "Viimase skannitud pildi eraldusvõime"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr "SANE-seade, millest pilte hankida."
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr "Tõene, kui rakenduse aken on maksimeeritud"
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+"Skanneeritava lehe suund skanneris. See võib olla üks järgnevaist: 'top-to-"
+"bottom' (ülalt alla), 'bottom-to-top' (alt üles), 'left-to-right' (vasakult "
+"paremale), 'right-to-left' (paremalt vasakule)."
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
+"kataloog."
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"Skannitud pildi kõrgus pikslites. Seda väärtust uuendatakse vastavalt "
+"viimati skannitud lehele."
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "Viimati skannitud pildi eraldusvõime, ühik on punkti tolli kohta."
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Teksti skannimisel kasutatav lahutus, punktides tolli kohta."
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"Skannitud piltide laius pikslites. Väärtust uuendatakse vastavalt viimati "
+"skannitud lehele."
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr "Skannitava dokumenti tüüp"
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+"Skannitava dokumendi tüüp. 'Tekst' on tekstidokumentide jaoks, 'foto' on "
+"fotode jaoks. See säte määrab skannimise eraldusvõime, värvid ja "
+"järeltöötluse."
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr "Skannitud pildi laius pikslites"
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr "Akna kõrgus pikslites"
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr "Akna laius pikslites"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+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.c:916
+msgid "Unable to connect to scanner"
+msgstr "Skanneriga ei suudetud ühenduda"
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr "Skannimist ei suudetud alustada"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr "Tõrge skanneriga suhtlemisel"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr "Skannimine nurjus"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr "Skannitud dokument"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+"Kasutus:\n"
+"  %s [SEADE...] - Skannimise vahend"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 ""
+"Abi valikud:\n"
+"  -d, --debug                     Silumisteadete printimine\n"
+"  -v, --version                   Versiooni kuvamine\n"
+"  -h, --help                      Abi valikute kuvamine\n"
+"  --help-all                      Kõigi abi valikute kuvamine\n"
+"  --help-gtk                      GTK+ valikute kuvamine"
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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+ võtmed:\n"
+"  --class=KLASS             Aknahalduri poolt kasutatav programmi klass\n"
+"  --name=NIMI               Aknahalduri poolt kasutatav programmi nimi\n"
+"  --screen=EKRAAN           Kasutatav X'i ekraan\n"
+"  --sync                    X'i kutsungid sünkroonseks\n"
+"  --gtk-module=MOODULID     Täiendavate GTK+ moodulite laadimine\n"
+"  --g-fatal-warnings        Kõikide hoiatuste muutmine saatuslikuks"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, 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.c:200
+msgid "No scanners detected"
+msgstr "Ühtegi skannerit ei tuvastatud"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr "PDF (mitmeleheküljeline dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr "JPEG (tihendatud)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr "PNG (kadudeta)"
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "Salvesta kui..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "Pildifailid"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "Kõik failid"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "Vali faili _tüüp"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Faili salvestamine nurjus"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "Abiteabe faili pole võimalik avada"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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/ui.c:1274
+msgid "About Simple Scan"
+msgstr "Lihtsast skannijast lähemalt"
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr "Lihtne dokumendi skaneerimise tööriist"
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  mahfiaz https://launchpad.net/~mahfiaz"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (mustand)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (kõrge kvaliteet)"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (vaikimisi)"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr "Puuduvad failid"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr "Palun kontrolli paigaldust"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "_Skanneri vahetamine"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr "Skannitud dokument.pdf"
diff --git a/po/eu.po b/po/eu.po
index a3c5348..8bfbbc3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,65 +554,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Jon Legarrea https://launchpad.net/~jonlegarrea"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index e17a500..51cb978 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-07 12:59+0000\n"
 "Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -408,27 +408,22 @@ msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Kuvanlukuasiakirja"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Tiedoston tallennus epäonnistui"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -436,7 +431,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -448,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -470,68 +465,88 @@ msgstr ""
 "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Esikatselusovelluksen avaus epäonnistui"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Valitse tiedosto_tyyppi"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Tiedoston tallennus epäonnistui"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Esikatselusovelluksen avaus epäonnistui"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,66 +563,76 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Tietoja Yksinkertainen kuvanluku (”Simple Scan”) -sovelluksesta"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Elias Julkunen https://launchpad.net/~eliasj\n"
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Tiedostoja puuttuu"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Tarkista asennuksesi tila"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Muuta _kuvanlukijaa"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Muuta _kuvanlukijaa"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
diff --git a/po/fr.po b/po/fr.po
index a4e618f..f79751b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-02 14:41+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-05-21 16:03+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Toutes les pages du _bac"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Verso"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Recadrer la page sélectionnée"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Recto"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Recto verso"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -72,12 +72,12 @@ msgstr "_Legal (US)"
 
 #: ../data/simple-scan.ui.h:21
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Taille de page :"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -127,7 +127,7 @@ msgstr "Enregistrer"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Enregistrer le document dans un fichier"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -277,11 +277,11 @@ msgstr "Sens de numérisation"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Dossier dans lequel les fichiers sont enregistrés"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Hauteur du papier en dixièmes de mm"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -289,7 +289,7 @@ msgstr "Hauteur de l'image numérisée en pixels"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Face(s) de la page à numériser"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -324,6 +324,8 @@ msgstr ""
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Le dossier où les fichiers sont enregistrés. S'il n'est pas défini, le "
+"dossier documents sera utilisé par défaut."
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid ""
@@ -338,11 +340,15 @@ 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/simple-scan.schemas.in.h:16
 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 »"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -373,6 +379,8 @@ 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/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -390,7 +398,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Largeur du papier en dixièmes de mm."
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -421,27 +429,22 @@ msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le scanner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Document numérisé"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Impossible d'enregistrer le fichier"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -451,7 +454,7 @@ msgstr ""
 "  %s [PÉRIPHÉRIQUE...] - utilitaire de numérisation"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -469,7 +472,7 @@ msgstr ""
 "  --help-gtk Affiche les options de GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -493,68 +496,88 @@ msgstr ""
 "  --g-fatal-warnings Rendre tous les avertissements fatals"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, 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.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Aucun scanner n'a été détecté"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Veuillez vérifier que votre scanner est connecté et sous tension"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Impossible d'ouvrir l'application de prévisualisation d'image"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multi-pages)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Fichiers images"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
+msgstr "Sélectionnez le _type de fichier"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
 msgstr ""
 
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Impossible d'ouvrir l'application de prévisualisation d'image"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -584,16 +607,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -611,50 +634,60 @@ msgstr ""
 "  Xavier Verne https://launchpad.net/~xavier-verne\n"
 "  beudbeud https://launchpad.net/~beudbeud"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Fichiers manquants"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Veuillez vérifier votre installation"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "Changer de _Scanner"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Automatique"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
diff --git a/po/gl.po b/po/gl.po
index 5257545..9c20bed 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-22 12:35+0000\n"
 "Last-Translator: Manuel Xosé Lemos <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -416,27 +416,22 @@ msgid "Unable to start scan"
 msgstr "Non foi posíbel iniciar o escaneo"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Produciuse un erro na comunicación co escaner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Documento escaneado"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Produciuse un fallo ao gardar o ficheiro"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -446,7 +441,7 @@ msgstr ""
 "  %s [DISPOSITIVO...] - Utilidade de escaneo"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -464,7 +459,7 @@ msgstr ""
 "  --help-gtk                      Mostra as opcións de GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -488,68 +483,88 @@ msgstr ""
 "  --g-fatal-warnings              Facer todos os avisos en erros fatais"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requírese o nome de usuario e contrasinal para acceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Non se puido detectar os escáneres"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escaner está conectado e aceso"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de múltiples páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Gardar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Elixa o _tipo de ficheiro"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -578,66 +593,76 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneo de documentos"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Francisco Diéguez https://launchpad.net/~frandieguez\n"
 "  Manuel Xosé Lemos https://launchpad.net/~mxlemos"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Faltan ficheiros"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Comprobe a súa instalación"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Cambiar o _escáner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Cambiar o _escáner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf escaneado"
diff --git a/po/he.po b/po/he.po
index 1ed0133..2b8892b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-27 20:15+0000\n"
 "Last-Translator: Liel Fridman <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -414,27 +414,22 @@ msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "שגיאה בהתקשרות עם הסורק"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "מסמך שנסרק"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "שמירת הקובץ נכשלה"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -444,7 +439,7 @@ msgstr ""
 "  %s [DEVICE...] - Scanning utility"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -462,7 +457,7 @@ msgstr ""
 "  --help-gtk                      Show GTK+ options"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -486,68 +481,88 @@ msgstr ""
 "  --g-fatal-warnings              Make all warnings fatal"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וסיסמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "לא זוהו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אובדן דתונים)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "בחירת _סוג קובץ"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "שמירת הקובץ נכשלה"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -574,16 +589,16 @@ msgstr ""
 "שלא, ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -591,50 +606,60 @@ msgstr ""
 "  Liel Fridman https://launchpad.net/~lielft\n"
 "  Yaron https://launchpad.net/~sh-yaron"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ברירת מחדל)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "חסרים קבצים"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "יש לבדוק את ההתקנה"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "ב_חירה בסורק אחר"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "ב_חירה בסורק אחר"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
diff --git a/po/hr.po b/po/hr.po
index 98b266b..c456c76 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Spremi kao..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,65 +554,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Ante Karamatić https://launchpad.net/~ivoks"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 4919a5b..2fa0e40 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-03-31 08:51+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -417,27 +417,22 @@ msgid "Unable to start scan"
 msgstr "Nem sikerült elindítani a szkennelést"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Kommunikációs hiba a szkennerrel"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Beszkennelt dokumentum"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "A fájl mentése sikertelen"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -447,7 +442,7 @@ msgstr ""
 "  %s [ESZKÖZ...] - Szkennelő segédprogram"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -465,7 +460,7 @@ msgstr ""
 "  --help-gtk GTK+ kapcsolók megjelenítése"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -490,69 +485,89 @@ msgstr ""
 "  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Mentés másként…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Válasszon fájl_típust"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -580,68 +595,79 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
 "  Krasznecz Zoltán https://launchpad.net/~krasznecz-zoltan\n"
 "  Pittmann Tamás https://launchpad.net/~zaivaldi\n"
-"  Richard Somlói https://launchpad.net/~ricsipontaz"
+"  Richard Somlói https://launchpad.net/~ricsipontaz\n"
+"  csola48 https://launchpad.net/~mail-csordaslaszlo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Hiányzó fájl"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Ellenőrizze a telepítést"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "_Szkennerváltás"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "_Szkennerváltás"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
diff --git a/po/it.po b/po/it.po
index 195ced7..592ccbf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-03-21 13:09+0000\n"
 "Last-Translator: Paolo Sammicheli <paolo@sammicheli.net>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -420,27 +420,22 @@ msgid "Unable to start scan"
 msgstr "Impossibile avviare la scansione"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Errore di comunicazione con lo scanner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Documento acquisito"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Salvataggio file non riuscito"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -450,7 +445,7 @@ msgstr ""
 "  %s [DISPOSITIVO...] - Strumento di acquisizione"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -468,7 +463,7 @@ msgstr ""
 "  --help-gtk Mostra le opzioni di GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -492,69 +487,89 @@ msgstr ""
 "  --g-fatal-warnings              Rende fatali tutti gli avvertimenti"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Non sono stati rilevati scanner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-"Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Salva come..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Seziona il _tipo di file"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Salvataggio file non riuscito"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+"Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -586,16 +601,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per la scansione di documenti"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -612,50 +627,60 @@ msgstr ""
 "  alexinfurs https://launchpad.net/~alexinfurs\n"
 "  suoko https://launchpad.net/~suoko"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "File mancanti"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Verificare l'installazione"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Cambia _scanner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Cambia _scanner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
diff --git a/po/ja.po b/po/ja.po
index 696a66f..1e6ed16 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-03-20 04:07+0000\n"
-"Last-Translator: Kentaro Kazuhama <kazken3@gmail.com>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-17 01:01+0000\n"
+"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "フィーダより全てのページ(_F)"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "戻る"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "選択した範囲の切り抜き"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "表面"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "表面と裏面"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "新規"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "ページサイズ:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "保存"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "ドキュメントをファイルに保存"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "原稿をスキャン(_O):"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "スキャン面:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -268,7 +268,7 @@ msgstr "ドキュメントをスキャンします"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr ""
+msgstr "スキャンするデバイス"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
@@ -276,7 +276,7 @@ msgstr "スキャン方向"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "ファイルを保存するディレクトリ"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
@@ -288,27 +288,27 @@ msgstr "スキャンされる画像の高さ(ピクセル)"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "スキャンする面"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "写真スキャンの解像度"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "テキストスキャンの解像度"
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "最後にスキャンした画像の解像度"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "画像を取得する SANE デバイスです。"
 
 #: ../data/simple-scan.schemas.in.h:11
 msgid "TRUE if the application window is maximized"
-msgstr ""
+msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
@@ -319,36 +319,36 @@ msgstr ""
 #: ../data/simple-scan.schemas.in.h:13
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
+msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
-msgstr ""
+msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
+msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "前にスキャンした画像の解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "写真をスキャンするときの解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "テキストをスキャンするときの解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid ""
@@ -364,7 +364,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
-msgstr ""
+msgstr "スキャンするドキュメントの種類"
 
 #: ../data/simple-scan.schemas.in.h:23
 msgid ""
@@ -375,24 +375,24 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "10mm単位での紙の幅"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
-msgstr ""
+msgstr "スキャン画像の幅(ピクセル)"
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
-msgstr ""
+msgstr "ウィンドウの高さ(ピクセル)"
 
 #: ../data/simple-scan.schemas.in.h:27
 msgid "Window width in pixels"
-msgstr ""
+msgstr "ウィンドウの幅(ピクセル)"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:916
@@ -405,35 +405,32 @@ msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "ファイルの保存に失敗しました"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
+"使い方:\n"
+"  %s [DEVICE...] - スキャンニング装置"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -445,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -460,68 +457,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "ファイルの保存に失敗しました"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -538,16 +555,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,50 +572,60 @@ msgstr ""
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
 "  Shushi Kurose https://launchpad.net/~kurokuro"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "ファイルが見つかりません"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "インストールされているか確認してください"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "スキャナを変更(_S)"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr ""
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
-msgstr "スキャンされたドキュメントpdf"
+msgstr "スキャンされたドキュメント.pdf"
diff --git a/po/lt.po b/po/lt.po
index 6d95cca..61700bb 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,66 +554,76 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\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.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index f7144e5..435fd11 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,65 +554,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Khairul Aizat Kamarudzzaman https://launchpad.net/~fenris"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 613d5dd..e93a3a4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-29 22:37+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetilbi@stud.ntnu.no>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -417,27 +417,22 @@ msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Skannet dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Lagring av fil mislyktes"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -447,7 +442,7 @@ msgstr ""
 "  %s [ENHET...] - Skanneutstyr"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -465,7 +460,7 @@ msgstr ""
 "  --help-gtk                      Vis alternativer for GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -489,68 +484,88 @@ msgstr ""
 "  --g-fatal-warnings              Make all warnings fatal"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 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å"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Åpning av forhåndsvisning mislyktes"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Lagre som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Lagring av fil mislyktes"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Åpning av forhåndsvisning mislyktes"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -579,16 +594,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,50 +612,60 @@ msgstr ""
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
 "  Mats Taraldsvik https://launchpad.net/~meastp"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Vennligst undersøk installasjonen"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Bytt _skanner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr "Automatisk"
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Bytt _skanner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
diff --git a/po/nl.po b/po/nl.po
index 4c01eba..d580d69 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-03-13 14:29+0000\n"
 "Last-Translator: cumulus007 <cumulus0007@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -423,27 +423,22 @@ msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Fout tijdens het communiceren met de scanner"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Gescand document"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Bestand opslaan mislukt"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -453,7 +448,7 @@ msgstr ""
 "  %s [APPARAAT...] - Hulpmiddel voor scannen"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -471,7 +466,7 @@ msgstr ""
 "  --help-gtk                      GTK+-opties weergeven"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -495,68 +490,88 @@ msgstr ""
 "  --g-fatal-warnings              Alle waarschuwingen fataal maken"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Opslaan als..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Bestands_type selecteren"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Bestand opslaan mislukt"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -587,16 +602,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -610,50 +625,60 @@ msgstr ""
 "  SvenVranckx https://launchpad.net/~sven-vranckx\n"
 "  cumulus007 https://launchpad.net/~cumulus-007"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Ontbrekende bestanden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Controleer uw installatie"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "_Scanner wijzigen"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "_Scanner wijzigen"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
diff --git a/po/oc.po b/po/oc.po
new file mode 100644
index 0000000..c358dcf
--- /dev/null
+++ b/po/oc.po
@@ -0,0 +1,673 @@
+# Occitan (post 1500) 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-04-18 14:33+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4 &#xD7; 6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "Totas las paginas del _nauc"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "Requadrar"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "Requadrar la pagina seleccionada"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr "_Legal (US)"
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "Novèl"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "Fotografia"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "Preferéncias"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "Pivotar cap a esquèrra"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "Pivotar cap a drecha"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "Pivotar cap a es_quèrra"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "Pivotar cap a _drecha"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+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)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "Salvar"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "Nu_merizar"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "Numerizar"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "F_ont de numerizacion :"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "Numerizar una sola pagina dempuèi lo scanner"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "Numerizacion simpla"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "_Pagina unica"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "Crear un document novèl"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "Arrestar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "Arrestar la numerizacion en cors"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "Tèxte"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "_Ensenhador"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "Re_quadrar"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "_Personalizat"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "_Document"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "_Corrièl"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "_Ajuda"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "_Letter (US)"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "_Pas cap"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "_Pagina"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "Sen_hal :"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "Resolucion per _fòto :"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "Pivota_r la seleccion"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "_Arrestar la numerizacion"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "Resolucion del _Tèxte :"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "_Utilizaire :"
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "Numerizar de documents"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "Numerizar dempuèi"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "Sens de numerizacion"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "Dorsièr ont los fichièrs son enregistrats"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "Nautor de l'imatge numerizat en pixèls"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "Resolucion per de numerizacions de fòtos"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "Resolucion per de numerizacions de tèxtes"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "Resolucion del darrièr imatge numerizat"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr "Periferic SANE d'utilizar per l'aquisicion dels imatges."
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr "VERAI se la fenèstra de l'aplicacion es maximizada"
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+"Direccion del balejatge al moment de la numerizacion de la pagina. Aquela "
+"pòt èsser : d'amont cap aval ; d'aval cap amont ; d'esquèrra cap a drecha ; "
+"de drecha cap a esquèrra"
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
+"documents serà utilizat per defaut."
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"La nautor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
+"foncion de la darrièra pagina numerizada."
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "La resolucion del darrièr imatge numerizat en punts per poce."
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
+"fòtos."
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
+"tèxte."
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"La largor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
+"foncion de la darrièra pagina numerizada."
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr "Natura del document que va èsser numerizat"
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+"Natura del document que serà numerizat. « tèxte » pels documents tèxte, "
+"« fòto » per las fotografias. Aquel paramètre determina la resolucion de la "
+"numerizacion, lo nombre de colors e los tractaments posteriors."
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr "Largor de l'imatge numerizat en pixèls"
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr "Nautor de la fenèstra en pixèls"
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr "Largor de la fenèstra en pixèls"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+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.c:916
+msgid "Unable to connect to scanner"
+msgstr "Impossible de se connectar al scanner"
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr "Impossible d'aviar la numerizacion"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr "Error de comunicacion amb lo scanner"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr "Fracàs de la numerizacion"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr "Document numerizat"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+"Usatge :\n"
+"  %s [PERIFERIC...] - utilitari de numerizacion"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 ""
+"Opcions d'ajuda :\n"
+"  -d, --debug Aficha los messatges d'error\n"
+"  -v, --version Aficha lo numèro de version\n"
+"  -h, --help Aficha las opcions d'ajuda\n"
+"  --help-all Aficha totas las opcions d'ajuda\n"
+"  --help-gtk Aficha las opcions de GTK+"
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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 ""
+"Opcions GTK+ :\n"
+"  --class=CLASSA Classa del programa tala coma utilizada pel gestionari de "
+"fenèstras\n"
+"  --name=NOM Nom del programa tal coma utilizat pel gestionari de fenèstras\n"
+"  --screen=ECRAN Ecran X d'utilizar\n"
+"  --sync Rendre los apèls X sincròns\n"
+"  --gtk-module=MODULS Cargar de moduls GTK+ suplementaris\n"
+"  --g-fatal-warnings Rendre totes los avertiments fatals"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, 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.c:200
+msgid "No scanners detected"
+msgstr "Cap de scanner es pas estat detectat"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr "Verificatz que vòstre scanner es connectat e jos tension"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multipaginas)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressat)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr "PNG (sens pèrda)"
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "Enregistrar jos..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "Fichièrs imatges"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "Totes los fichièrs"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "Seleccionatz lo _tipe de fichièr"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "Impossible de dobrir lo fichièr d'ajuda"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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 ""
+"Aqueste programa es liure, lo podètz redistribuir e/o lo modificar\n"
+"segon los tèrmes de la licéncia publica generala (GPL) GNU publicada\n"
+"per la Free Software Foundation, dins sa version 3 o superiora\n"
+"(coma volètz).\n"
+"\n"
+"Aqueste programa es distribuit dins l'esper d'èsser util, mas\n"
+"SENS CAP DE GARANTIA, inclusas las garantias de \n"
+"COMERCIALIZACION o d'ADAPTACION A UNA TÒCA ESPECIFICA.\n"
+"Consultez la licence publique générale GNU pour plus de détails.\n"
+"\n"
+"Vos cal aver recebut una còpia de la licéncia publica generala GNU\n"
+"al meteis temps qu'aqueste programa ; s'es pas lo cas, consultatz\n"
+"<http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.c:1274
+msgid "About Simple Scan"
+msgstr "A prepaus de Simple Scan"
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr "Numerizar simplament vòstres documents"
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (borrolhon)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr "%d ppp"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (nauta resolucion)"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (per defaut)"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr "Fichièrs mancants"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr "Verificatz vòstra installacion"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Cambiar de _scanner"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf numerizat"
diff --git a/po/pl.po b/po/pl.po
index 3f2bf27..cacf3c8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-27 17:44+0000\n"
+"POT-Creation-Date: 2010-07-07 04:08+0000\n"
+"PO-Revision-Date: 2010-07-07 14:00+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-08 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -426,27 +426,22 @@ msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Błąd podczas komunikacji ze skanerem"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Zeskanowany dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Zapisanie pliku się nie powiodło"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -456,7 +451,7 @@ msgstr ""
 "  %s [URZĄDZENIE...] - Narzędzie do skanowania"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -474,7 +469,7 @@ msgstr ""
 "  --help-gtk                      Wyświetla opcje GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -498,68 +493,88 @@ msgstr ""
 "  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Uzyskanie dostępu do \"%s\" wymaga podania nazwy użytkownika i hasła"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Nie można otworzyć programu podglądu obrazów"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Proszę wybrać _typ pliku"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr "Zapisać bieżący dokument?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr "Odrzuć zmiany"
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Nie można otworzyć programu podglądu obrazów"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -591,16 +606,16 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -608,54 +623,65 @@ msgstr ""
 "  Michał Sawicz https://launchpad.net/~saviq\n"
 "  Miłosz Kosobucki https://launchpad.net/~mikom\n"
 "  Piotr Drąg https://launchpad.net/~raven46\n"
+"  Piotr Strębski https://launchpad.net/~strebski\n"
 "  Piotr Wicijowski https://launchpad.net/~piwsko\n"
 "  Tomasz 'Zen' Napierala https://launchpad.net/~tzn\n"
 "  tomko222 https://launchpad.net/~tomko222"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr "Zapisać dokument przed zakończeniem programu?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr "Zakończenie bez zapisania"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (szkic)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (wysoka rozdzielczość)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (domyślnie)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Nie można odnaleźć plików"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Proszę sprawdzić poprawność instalacji"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Zmień _skaner"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Zmień _skaner"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
diff --git a/po/pt.po b/po/pt.po
index 83d3852..4a1aca1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-03 12:21+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-03 21:51+0000\n"
 "Last-Translator: Tiago <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr ""
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Verso"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Cortar a página seleccionada"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Frente"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Frente e Verso"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -82,7 +82,7 @@ msgstr ""
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. Title of preferences dialog
 #: ../data/simple-scan.ui.h:27
@@ -141,7 +141,7 @@ msgstr ""
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
-msgstr ""
+msgstr "Origem da Digitalizaçã_o:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
@@ -156,7 +156,7 @@ msgstr ""
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr ""
+msgstr "Simple Scan"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:56
@@ -405,35 +405,32 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
+"Utilização:\n"
+"  %s [DISPOSITIVO...] - Utilitário de digitalização"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -445,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -460,68 +457,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Guardar Como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -538,16 +555,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,50 +572,60 @@ msgstr ""
 "  Luis Pratas https://launchpad.net/~luispratas\n"
 "  Tiago https://launchpad.net/~tiagosilva"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
-msgstr ""
+msgstr "Ficheiros em falta"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
+msgstr "Por favor, verifique a sua instalação"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr ""
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Documento Digitalizado.pdf"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a613a6e..5df7478 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-28 21:55+0000\n"
 "Last-Translator: André Gondim <andregondim@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -418,27 +418,22 @@ msgid "Unable to start scan"
 msgstr "Não foi possível iniciar o digitalizador"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Erro ao comunicar com o digitalizador"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Falha ao salvar o arquivo"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -448,7 +443,7 @@ msgstr ""
 "  %s [DISPOSITIVO...] - Utilitário de escaneamento"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -466,7 +461,7 @@ msgstr ""
 "  --help-gtk                      Mostra as opções do GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -490,68 +485,88 @@ msgstr ""
 "  --g-fatal-warnings              Torna todos os avisos fatais"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Salvar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Selecionar _tipo de arquivo"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 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.c:1084
+#: ../src/ui.c:1260
 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"
@@ -581,70 +596,81 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador Simples"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Benjamim Gois Ildefonso da Silva https://launchpad.net/~benjamim-gois\n"
+"  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade\n"
 "  Rafael Zenni https://launchpad.net/~rafaeldz\n"
 "  Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n"
 "  andbelo https://launchpad.net/~andbelo\n"
 "  kahue https://launchpad.net/~kahuemm"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Arquivos faltando"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Por favor verifique a sua instalação"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Alterar _digitalizador"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Alterar _digitalizador"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Digitalizado documento.pdf"
diff --git a/po/ro.po b/po/ro.po
index 7f945e6..8408615 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Eroare la scanare"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Eroare la salvarea fișierului"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -436,7 +431,7 @@ msgstr ""
 "  %s [DISPOZITIV...] - Utilitar de scanare"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -448,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -472,68 +467,88 @@ msgstr ""
 "  --g-fatal-warnings              Consideră toate avertismentele fatale"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Numele de utilizator și parola sunt necesare pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Salvează ca..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Eroare la salvarea fișierului"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -562,16 +577,16 @@ msgstr ""
 "acest program. În caz contrar, consultați <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Despre Scanare simplă"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Utilitar simplu pentru scanare de documente"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -581,50 +596,60 @@ msgstr ""
 "  ValentinV https://launchpad.net/~valentinverde\n"
 "  sfantu https://launchpad.net/~sfantus1"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Lipsesc fișiere"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Verificați instalarea"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
diff --git a/po/ru.po b/po/ru.po
index a1ab640..b49c132 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-04-10 14:59+0000\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -416,27 +416,22 @@ msgid "Unable to start scan"
 msgstr "Не могу начать сканирование"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Ошибка при работе со сканером"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Не удалось сохранить файл"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -446,7 +441,7 @@ msgstr ""
 "  %s [УСТРОЙСТВО...] - Инструмент для сканирования"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -464,7 +459,7 @@ msgstr ""
 "  --help-gtk показать ключи GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -486,68 +481,88 @@ msgstr ""
 "  --g-fatal-warnings              Сделать все предупреждения фатальными"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Пожалуйста, проверьте, что сканер подсоединен и включен"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Невозможно открыть программу для просмотра изображений"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Сохранить как..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Все файлы"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Выберите _тип файла"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Не удалось сохранить файл"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Невозможно открыть программу для просмотра изображений"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -576,16 +591,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "О Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -593,53 +608,64 @@ msgstr ""
 "  Alexandre Prokoudine https://launchpad.net/~alexandre-prokoudine\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
+"  Oleg https://launchpad.net/~oleg-devyatilov\n"
 "  Oleg Koptev https://launchpad.net/~koptev-oleg\n"
 "  Артём Попов https://launchpad.net/~artfwo"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Файлы отсутствуют"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Пожалуйста, проверьте правильность установки программы"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Сменить _сканер"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Сменить _сканер"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
diff --git a/po/sk.po b/po/sk.po
index 00f7a6e..4d0c312 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-13 20:04+0000\n"
 "Last-Translator: Laco Gubík <Unknown>\n"
 "Language-Team: Slovak <sk@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: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -414,27 +414,22 @@ msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Ukladanie súboru zlyhalo"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -444,7 +439,7 @@ msgstr ""
 "  %s [ZARIADENIE...] - Skenovacia pomôcka"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -462,7 +457,7 @@ msgstr ""
 "  --help-gtk Zobraziť GTK+ možnosti"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -484,68 +479,88 @@ msgstr ""
 "  --g-fatal-warnings Zmeniť všetky upozornenia na terminálne"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Žiadne skenery neboli nájdené"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Ukladanie súboru zlyhalo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -575,66 +590,76 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  6205 https://launchpad.net/~6205-deactivatedaccount\n"
-"  Laco Gubík https://launchpad.net/~lacogubik-gmail"
+"  Laco Gubík https://launchpad.net/~laco"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Chýbajúce súbory"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Prosím skontrolujte vašu inštaláciu"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Zmeniť _skener"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Zmeniť _skener"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
diff --git a/po/sl.po b/po/sl.po
index cd65eaa..62b14f1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-03-13 09:16+0000\n"
+"POT-Creation-Date: 2010-07-08 04:05+0000\n"
+"PO-Revision-Date: 2010-07-10 20:01+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Vse strani iz _podajalnika"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Hrbtna stran"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Obreži izbrano stran"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Prednja stran"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Hrbtna in prednja stran"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Novo"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Velikost strani:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,37 +126,37 @@ msgstr "Shrani"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Shrani dokument v datoteko"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
 msgid "Sc_an"
-msgstr "Sk_eniraj"
+msgstr "Op_tično branje"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:46
 msgid "Scan"
-msgstr "Skeniraj"
+msgstr "Optično branje"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
-msgstr "Vir s_keniranja:"
+msgstr "_Vir optičnega branja:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Stran optičnega branja:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
 msgid "Scan a single page from the scanner"
-msgstr "Skeniranje ene streni iz skenerja"
+msgstr "Optično branje ene strani iz skenerja"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr "Preprosto skeniranje"
+msgstr "Enostavno optično branje"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:56
@@ -175,7 +175,7 @@ msgstr "Zaustavi"
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:61
 msgid "Stop the current scan"
-msgstr "Ustavi trenutno skeniranje"
+msgstr "Zaustavi trenutno optično branje"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:63
@@ -190,7 +190,7 @@ msgstr "_Pooblasti"
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:67
 msgid "_Contents"
-msgstr "Vsebina pomoči"
+msgstr "_Vsebina"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:69
@@ -210,7 +210,7 @@ msgstr "_Dokument"
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:75
 msgid "_Email"
-msgstr "_E-pošta"
+msgstr "_Elektronska pošta"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:77
@@ -230,7 +230,7 @@ msgstr "_Brez"
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:83
 msgid "_Page"
-msgstr "Stran"
+msgstr "_Stran"
 
 #. Label beside password entry
 #: ../data/simple-scan.ui.h:85
@@ -240,7 +240,7 @@ msgstr "_Geslo:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
 msgid "_Photo Resolution:"
-msgstr "_Ločljivost za fotografije:"
+msgstr "_Ločljivost fotografij:"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:89
@@ -250,12 +250,12 @@ msgstr "_Zavrti obrezovano območje"
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:91
 msgid "_Stop Scan"
-msgstr "_Zaustavi skeniranje"
+msgstr "_Zaustavi optično branje"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr "_Ločljivost za besedila:"
+msgstr "_Ločljivost besedila:"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:95
@@ -264,15 +264,15 @@ msgstr "_Uporabniško ime za vir:"
 
 #: ../data/simple-scan.desktop.in.h:1
 msgid "Scan Documents"
-msgstr "Skeniraj dokumente"
+msgstr "Optično preberite dokumente"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr "Naprava za skeniranje"
+msgstr "Naprava za optično branje"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
-msgstr "Smer skeniranja"
+msgstr "Smer optičnega branja"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
@@ -280,11 +280,11 @@ msgstr "Mapa za shranjevanje datotek"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Višina papirja v desetinkah milimetra"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
-msgstr "Višina skenirane slike v točkah"
+msgstr "Višina optično prebrane slike v točkah"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
@@ -292,15 +292,15 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
-msgstr "Ločljivost za skeniranje fotografij"
+msgstr "Ločljivost za optično branje fotografij"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "Resolution for text scans"
-msgstr "Ločljivost za skeniranje besedil"
+msgstr "Ločljivost za optično branje besedil"
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "Resolution of last scanned image"
-msgstr "Ločljivost zadnjega skeniranja"
+msgstr "Ločljivost zadnjega optičnega branja"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
@@ -315,8 +315,9 @@ 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 ""
-"Smer skenerja čez skenirano stran. Lahko je ena od sledečih: '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'"
 
 #: ../data/simple-scan.schemas.in.h:13
 msgid ""
@@ -329,49 +330,54 @@ msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
-"Višina skenirane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje skenirane strani."
+"Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+"zadnje optično prebrane strani."
 
 #: ../data/simple-scan.schemas.in.h:15
 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/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
+"'zadaj'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Ločljivost zadnjega skeniranja v točkah na palec (dpi)"
+msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Ločljivost pri skeniranju fotografij v točkah na palec (dpi)"
+msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Ločljivost pri skeniranju besedil v točkah na palec (dpi)"
+msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid ""
 "The width of scanned image in pixels. This value is updated to what the last "
 "scanned page was."
 msgstr ""
-"Širina skenirane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje skenirane strani."
+"Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+"zadnje optično brane strani."
 
 #: ../data/simple-scan.schemas.in.h:21
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
-msgstr "Vrsta skeniranega dokumenta"
+msgstr "Vrsta optično branega dokumenta"
 
 #: ../data/simple-scan.schemas.in.h:23
 msgid ""
@@ -379,17 +385,17 @@ msgid ""
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
-"Vrsta skeniranega dokumenta. 'besedilo' za dokumente z besedilom, "
-"'fotografije' za fotografije. Ta nastavitev določi ločljivost skeniranje, "
-"barve in nadaljnje odvelovanje"
+"Vrsta optično branega dokumenta. 'besedilo' za dokumente z besedilom, "
+"'fotografije' za fotografije. Ta nastavitev določi ločljivost optičnega "
+"branja, barve in nadaljnje obdvelovanje"
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Širina papirja v desetinkah milimetra"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
-msgstr "Širina skenirane slike v točkah"
+msgstr "Širina optično brane slike v točkah"
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
@@ -402,50 +408,45 @@ msgstr "Širina okna v točkah"
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Ni skenerjev na voljo. Priklopite skener."
+msgstr "Ni optičnih bralnikov na voljo. Priklopite optični bralnik."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:916
 msgid "Unable to connect to scanner"
-msgstr "S skenerjem se ni mogoče povezati"
+msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
 #. Error display when unable to start scan
 #: ../src/scanner.c:1222
 msgid "Unable to start scan"
-msgstr "Skeniranja ni mogoče začeti"
+msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
-msgstr "Napaka med komuniciranjem s skenerjem"
+msgstr "Napaka med sporazumevanjem z optičnim bralnikom"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
-msgstr "Skeniranje je spodletelo"
+msgstr "Optično branje je spodletelo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
-msgstr "Skeniran dokument"
-
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Shranjevanje datoteke je spodletelo"
+msgstr "Optično bran dokument"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
 "Uporaba:\n"
-"  %s [NAPRAVA ...] - Pripomoček skeniranja"
+"  %s [NAPRAVA ...] - Pripomoček optičnega branja"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -463,7 +464,7 @@ msgstr ""
 "  --help-gtk Pokaže možnosti GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -478,75 +479,95 @@ msgid ""
 msgstr ""
 "Možnosti GTK+:\n"
 "  --class=CLASS Programski razred uporabljen v upravljalniku oken\n"
-"  --name=NAME Ime programa, ki uporabljen v upravljalniku oken\n"
-"  --screen=SCREEN X zaslon za uporabo\n"
+"  --name=NAME Ime programa, ki je uporabljen v upravljalniku oken\n"
+"  --screen=SCREEN Zaslon X za uporabo\n"
 "  --sync Uskladi klice X\n"
 "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
-"  --g-fatal-warnings Določi vsa opozorila usodna"
+"  --g-fatal-warnings Naredi vsa opozorila usodna"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
-msgstr "Skenerja ni mogoče zaznati"
+msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
-msgstr "Preverite da je vaš skener povezan in vklopljen"
-
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Ni mogoče odpreti programa predogleda slik"
+msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
-msgstr "Shrani kot..."
+msgstr "Shrani kot ..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Shranjevanje datoteke je spodletelo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+msgid "If you don't save, changes will be permanently lost."
+msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:594
+msgid "Save current document?"
+msgstr "Naj bo trenutni dokument shranjen?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr "Zavrzi vse spremembe"
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Ni mogoče odpreti programa predogleda slik"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -578,16 +599,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O Programu"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
-msgstr "Preprosto orodje za skeniranje dokumentov"
+msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -595,50 +616,60 @@ msgstr ""
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
 "  grofaty https://launchpad.net/~grofaty"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr "Končaj brez shranjevanja"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Datoteke manjkajo"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
-msgstr "Preverite vašo namestitev"
+msgstr "Preverite svojo namestitev"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Spremeni _Skener"
+msgstr "Samodejno"
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
-msgstr "Skeniran dokument.pdf"
+msgstr "Optično bran dokument.pdf"
diff --git a/po/sq.po b/po/sq.po
new file mode 100644
index 0000000..aa81e46
--- /dev/null
+++ b/po/sq.po
@@ -0,0 +1,627 @@
+# Albanian 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-22 23:26+0000\n"
+"Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
+"Language-Team: Albanian <sq@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "Të Gjitha Faqet Nga _Ushqyesi"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr "Mbrapa"
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "Prej"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "Preje faqen e përzgjedhur"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr "Përball"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr "Para dhe Mbrapa"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "I ri"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr "Përmasa e Faqes:"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "Foto"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "Parapëlqimet"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "Rrotullo Majtas"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "Rrotullo Djathtas"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "Rrotullo _Majtas"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "Rrotullo _Djathtas"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rrotullo faqen në të majtë"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rrotullo faqen në të djathtë"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "Ruaj"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr "Ruaje dokumentin tek një fajll"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "Sk_anim"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "Skanim"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "Skanoje b_urimin"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr "Skanoje anën"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "Skanoje një faqe të thjeshtë prej skanerit"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "Skanim i thjeshtë"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "Faqe_e_vetme"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "Filloje një dokument të ri"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "Ndalo"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "Ndaloje skanimin e tanishëm"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "Tekst"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "_Autorizo"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "_Përmbajtje"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "Preje"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "_Sipas përdoruesit"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "_Dokumenti"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "_Email"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "_Ndihmë"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "_Shkronjë"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "_Asnjë"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "_Faqe"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "_Fjalëkalim:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "_Rezolucioni i Fotos:"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "_Prerje me Rrotullim"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "_Ndalo Skanimin"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "_Rezolucioni i Tekstit:"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "Shfrytëzuesi për resurse"
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "Skanoj Dokumentet"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "Paisje për te skanuar prej"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "Drjetim i skanimit"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "Vend për ti ruajtur gjërat"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr "Lartësia e letrës në dhjetat e një mm"
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "Lartësia e figurës së skanuar në pixella"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr "Anë e faqes për tu skanuar"
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "Rezulucion për skanimet e fotove"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "Rezulucion per skanimet e teksteve"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "Rezulucion i imazhit të fundit të skanuar"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:916
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 ""
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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 ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.c:200
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "Ruaje Si..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "Kartela Pamje"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "Të Gjithë Skedarët"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "Zgjidh Llojin e _Skedarit"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "E pamundur hapja e file të ndihmës"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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/ui.c:1274
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Alket Rexhepi https://launchpad.net/~alketii"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 041a81d..56684ee 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr "Није могуће започети скенирање"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Грешка у скенирању"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Грешка у снимању датотеке"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -436,7 +431,7 @@ msgstr ""
 "  %s [DEVICE...] - алатка за скенирање"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -448,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -472,68 +467,88 @@ msgstr ""
 "  --g-fatal-warnings              Поставља сва упозорења као кобна"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Нема препознатих скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Сачувај као..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Грешка у снимању датотеке"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -562,65 +577,75 @@ msgstr ""
 "заједно са овим програмом. Ако не, види <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "О Једноставно скенирање"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Алатка за једноставно скенирање докумената"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Ivan Petrovic https://launchpad.net/~ivanpetrovic"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Недостају датотеке"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Проверите вашу инсталацију"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
diff --git a/po/sv.po b/po/sv.po
index ee71225..7667ebf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-03-15 19:01+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-27 08:29+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Alla sidor från _matare"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Baksida"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Beskär den valda sidan"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Framsida"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Fram- och baksida"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Ny"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Sidstorlek:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Spara"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Spara dokument till en fil"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "Inläsnings_källa:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Inläsningssida:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Katalog att spara filer i"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Höjd på pappret i tiondels millimeter"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Höjd för den inlästa bilden i bildpunkter"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Sida att läsa in"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -339,11 +339,14 @@ 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/simple-scan.schemas.in.h:16
 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\""
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -370,6 +373,8 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
+"pappersidentifiering)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -387,7 +392,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Bredd på pappret i tiondels millimeter"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -417,27 +422,22 @@ msgid "Unable to start scan"
 msgstr "Kan inte starta inläsning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Fel i kommunikation med bildläsare"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Inläst dokument"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Misslyckades med att spara filen"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -447,7 +447,7 @@ msgstr ""
 "  %s [ENHET...] - Inläsningsverktyg"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -465,7 +465,7 @@ msgstr ""
 "  --help-gtk                      Visa GTK+-flaggor"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -489,68 +489,88 @@ msgstr ""
 "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Spara som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Alla filer"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Välj fil_typ"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -580,16 +600,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,50 +617,60 @@ msgstr ""
 "  Daniel Nylander https://launchpad.net/~yeager\n"
 "  Jens Askengren https://launchpad.net/~jens-askengren"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Filer saknas"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Kontrollera din installation"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Automatiskt"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
diff --git a/po/te.po b/po/te.po
index f3aeebd..911e73c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr ""
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -434,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -446,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -461,68 +456,88 @@ msgid ""
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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,65 +554,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  వీవెన్ (Veeven) https://launchpad.net/~veeven"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr ""
diff --git a/po/th.po b/po/th.po
new file mode 100644
index 0000000..fe1ef64
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,667 @@
+# Thai 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-05-24 04:22+0000\n"
+"Last-Translator: SiraNokyoongtong <gumaraa@gmail.com>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr "หลัง"
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "ตัด"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "ตัดหน้าที่เลือก"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr "หน้า"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr "หน้าและหลัง"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "สร้าง"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr "ขนาดกระดาษ :"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "ภาพถ่าย"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "คุณสมบัติ"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "หมุนซ้าย"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "หมุนขวา"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "หมุน_ซ้าย"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "หมุน_ขวา"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "บันทึก"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr "บันทึกเอกสารเป็นแฟ้ม"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "สแกน"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "สแกน"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "แ_หล่งสแกน:"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr "สแกนด้าน:"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "Simple Scan"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "_หน้าเดี่ยว"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "เริ่มเอกสารใหม่"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "หยุด"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "หยุดการสแกนขณะนี้"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "ข้อความ"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "_อนุญาต"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "เ_นื้อหา"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "_ตัด"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "_กำหนดเอง"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "เ_อกสาร"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "_อีเมล"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "_จดหมาย"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "ไ_ม่มี"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "_หน้า"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "รหัส_ผ่าน:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "ความละเอียด_ภาพถ่าย:"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "หมุ_นภาพตัด"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "_หยุดสแกน:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "ความละเอียด_ข้อความ:"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "_ชื่อผู้ใช้ทรัพยากร :"
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "สแกนเอกสาร"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "เครื่องสแกนจาก"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "ทิศทางของการสแกน"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr "หน้ากระดาษ ด้านที่จะสแกน"
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "ความละเอียดการสแกนภาพถ่าย"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "ความละเอียดการสแกนข้อความ"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr "อุปกรณ์ SANE เพื่อรับภาพจาก"
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+"ทิศทางการสแกนข้ามหน้าสแกน มีความสามารถดังนี้: 'บน-ไป-ล่าง' 'ล่าง-ไป-บน' "
+"'ซ้าย-ไป-ขวา' 'ขวา-ไป-ซ้าย'"
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"ความสูงของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"ความสูงของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr "สแกนหน้ากระดาษ สามารถสแกนได้จากนี้ :'ทั้งคู่' 'หน้า' 'หลัง'"
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "ความละเอียด เป็นจุดต่อ นิ้วของภาพที่สแกนก่อนหน้านี้"
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนข้อความ"
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr "ชนิดของเอกสารที่ถูกสแกน"
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+"ชนิดของเอกสารที่ถูกสแกน 'ข้อความ'สำหรับเอกสารข้อความ'รูปภาพ'สำหรับภาพถ่าย "
+"การตั้งค่านี้ตัดสินใจในการสแกนความละเอียดของสีและหลังการประมวลผล"
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr "ความสูงของหน้าต่างเป็นพิกเซล"
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+msgid "No scanners available.  Please connect a scanner."
+msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:916
+msgid "Unable to connect to scanner"
+msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr "ไม่สามารถเริ่มต้นการสแกน"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr "การสแกนล้มเหลว"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr "เอกสารที่สแกนแล้ว"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 ""
+"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"
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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=CLASS                   "
+"คลาสของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
+"  --name=NAME                     "
+"ชื่อของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
+"  --screen=SCREEN                 สกรีน X ที่จะใช้\n"
+"  --sync                          ทำให้การเรียก X เป็นแบบหยุดคอย "
+"(synchronous)\n"
+"  --gtk-module=MODULES            โหลดมอดูล GTK+ เพิ่มเติม\n"
+"  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
+"ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.c:200
+msgid "No scanners detected"
+msgstr "ไม่พบเครื่องสแกน"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr "PDF (เอกสารหลายหน้า)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr "JPEG (บีบอัดแล้ว)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "บันทึกเป็น..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "แฟ้มภาพ"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "แฟ้มทั้งหมด"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "เลือก_ประเภทแฟ้ม"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "การบันทึกแฟ้มล้มเหลว"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.c:1274
+msgid "About Simple Scan"
+msgstr "เกี่ยวกับ Simple Scan"
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  SiraNokyoongtong https://launchpad.net/~gumara"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (ภาพร่าง)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (ความละเอียดสูง)"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (ค่าปริยาย)"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr "ไม่พบแฟ้ม"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "เ_ปลี่ยนเครื่องสแกน"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "อัตโนมัติ"
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr "สแกน Document.pdf แล้ว"
diff --git a/po/tr.po b/po/tr.po
index 07d8a17..929188e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-05-04 22:48+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-04 02:53+0000\n"
 "Last-Translator: Murat Bişkin <mbiskin@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -280,7 +280,7 @@ msgstr "Dosyaların kaydedileceği dizin"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Taranacak sayfa tarafı"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -338,11 +338,15 @@ msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
+"için 0)."
 
 #: ../data/simple-scan.schemas.in.h:16
 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'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -373,6 +377,8 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
+"için 0)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -390,7 +396,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -420,27 +426,22 @@ msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Tarayıcı ile iletişim kurulamıyor"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Taranmış Belge"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Dosya kaydedilemedi"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -450,7 +451,7 @@ msgstr ""
 "  %s [AYGIT...] - Tarama aracı"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -468,7 +469,7 @@ msgstr ""
 "  --help-gtk GTK+ seçeneklerini göster"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -492,68 +493,88 @@ msgstr ""
 "  --g-fatal-warnings              Tüm uyarıları ölümcül yapar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 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"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Görüntü ön izleme uygulaması açılamıyor"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Dosya _Türünü Seç"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Dosya kaydedilemedi"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Görüntü ön izleme uygulaması açılamıyor"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -582,68 +603,79 @@ msgstr ""
 "Eğer almazsanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Angel Spy https://launchpad.net/~dilara.ekinci\n"
 "  Efe Çiftci https://launchpad.net/~efeciftci\n"
 "  Murat Bişkin https://launchpad.net/~muratbiskin\n"
 "  Yalçın Can https://launchpad.net/~echza\n"
 "  aries https://launchpad.net/~sonagirbas"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Dosyalar eksik"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Lütfen kurulumunuzu denetleyiniz"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Otomatik"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
diff --git a/po/ug.po b/po/ug.po
new file mode 100644
index 0000000..e87c958
--- /dev/null
+++ b/po/ug.po
@@ -0,0 +1,671 @@
+# Uyghur 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-04-11 09:36+0000\n"
+"Last-Translator: azimat <Unknown>\n"
+"Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
+"ug@lists.launchpad.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Language: Uighur\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "كىرگۈزگۈچتىن ھەممە بەتلەر(_F)"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "كېسىش"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "تاللانغان بەتنى كېسىش"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr "US Legal(_G)"
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "يېڭى"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "سۈرەت"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "مايىللىق"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "سولغا ئايلاندۇرۇش"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "ئوڭغا ئايلاندۇرۇش"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "سولغا ئايلاندۇرۇش(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "ئوڭغا ئايلاندۇرۇش(_R)"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "بەتنى سولغا ئايلاندۇرۇش (سائەت يۆلىنىشىگە قارشى)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "بەتنى ئوڭغا ئايلاندۇرۇش (سائەت يۆلىنىشىدە)"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "ساقلاش"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "سكەن(_A)"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "سىكەن قىلىش"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "سىكەن قىلىش مەنبەسى(_O):"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "سىكەننېردىن پەقەت بىر بەتنىلا سىكەن قىلىش"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "ئاددى سىكەن قىلىش"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "بىر تاللام بەت(_P)"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "يېڭى ھۆججەت قۇرۇش"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "توختىتىش"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "نۆۋەتتىكى سكەن باسقۇچىنى توختىتىش"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "تېكست"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "تەستىقلاش(_A)"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "مەزمۇن(_C)"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "كېسىش(_C)"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "ئىختىيارى(_C)"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "ھۆججەت(_D)"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "ئېلخەت(_E)"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "ياردەم(_H)"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "US Letter(_L)"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "يوق (N)(_N)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "بەت(_P)"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "پارول(_P):"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "–فوتو ئېنىقلىقى(_P):"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "كېسش تاللانمىسىنى ئايلاندۇرۇش(_R)"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "سكەننى توختىتىش(_S)"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "تېكست ئېنىقلىقى(_T):"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "مەنبە ئۈچۈن ئىشلەتكۈچى نامى(_U):"
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "ھۆججەتلەرنى سكەنلەش"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "سكەن ئەسۋەبى"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "سكەنلەش نىشانى"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "ئارخىپلار ساقلىنىدىغان نىشان"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "سكەنلىگەن رەسىمنىڭ پىكسېل ئېگىزلىكى"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "فوتو سكەننىڭ ئېنىقلىقى"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "تېكست سكەننىڭ ئېنىقلىقى"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "ئەڭ ئاخىرقى قېتىم سىكەنلىگەن رەسىمنىڭ ئېنىقلىقى"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr "رەسىمگە ئېرشدىغان SANE-ئەسۋابى"
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr "ئەگەر پروگگرامما كۆزنىكى ئەڭ چوڭ ھالدا بولسا TRUE"
+
+#: ../data/simple-scan.schemas.in.h:12
+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 ""
+"سكەنلىگەن بەتنىڭ سىكەن يۆلىنشىگە بولغان ماسلىقى تۆۋەندىكىدىن بىرسى بۇلىشى "
+"مۇنكىن: ‹ئۈستىدىن ئاستىغا›، ‹ئاستىدىن ئۈستىگە›، ‹سولدىن ئوڭغا›، ‹ئوڭدىن "
+"سولغا›"
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ئارخىپلار ساقلىنىدىغان نىشان. ئەگەر باشقا نىشان بەلگىلەنگەن بولمىسا، ھۆججەت "
+"ئارخىپى كۆڭۈلدىكى."
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"سىكەنلىگەن رەسىمنىڭ پىكسېل ئىگىزلىكى. بۇ قىممەت ئالدىنقى قېتىم سىكەنلىگەن "
+"بەتنىڭ قىممىتىگەن باراۋەر."
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "ئالدىنقى قېتىم سكەنلىگەن رەسىمنىڭ DPI (چېكىت ھەر دىيۇم) ئېنىقلىقى"
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "DPI (چېكىت ھەر دىيۇم) رەسىملەرگە ئىشلىتىدىغان قىممەت"
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "DPI (چېكىت ھەر دىيۇم) تېكستلارغا ئىشلىتىدىغان قىممەت"
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"سكەنلىگەن رەسىمنىڭ دىيۇم كەڭلىكى. بۇنىڭ قىممىتى ئەڭ ئاخىرقى قېتىم سىكەنلىگەن "
+"بەتنىڭ قىممىتىگە ماس كىلىدۇ."
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr "سكەنلىگەن رەسىمنىڭ تىپى"
+
+#: ../data/simple-scan.schemas.in.h:23
+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 ""
+"سكەنلىگەن رەسىمنىڭ تىپى. تېكىست ھۆججەتلەر ئۈچۈن ‹تېكىست›، رەسىملەر ئۈچۈن "
+"ر‹رەسىم›.  بۇ سەپلىمە سكەن ئېنىقلىقىنى، رەڭ ۋە كېيىنكى باسقۇچلارنى "
+"بەلگىلەيدۇ."
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr "سىكەنلىگەن رەسىمنىڭ دىيۇم كەڭلىكى"
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr "دىيۇم كۆزنەك ئېگىزلىكى"
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr "دىيۇم كۆزنەك كەڭلىكى"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+msgid "No scanners available.  Please connect a scanner."
+msgstr "سكەننېر مەۋجۇت ئەمەس. سىكەننېرنى چېتىڭ"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:916
+msgid "Unable to connect to scanner"
+msgstr "سكەننېر بىلەن ئۇلانما باغلىغىلى بولمىدى"
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr "سكەن جەريانىنى قوزغاتقىلى بولمىدى"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr "سكەننېر بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr "سكەنلەش مەغلۇپ بولدى"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr "سكەنلىگەن ھۆججەت"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+"ئىشلىتىلىشى\n"
+"%s[ئەسۋاب...] - سكەن قورالى"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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 Debug-ئۇچۇرلىرىنى كۆرسىتىدۇ\n"
+"-v,--نۇسخا نۇسخا نۇمۇرىنى كۆرسىتىدۇ\n"
+"-h,--ياردەم ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
+"-help-all ھەممە ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
+"-help-gtk GTK+ تاللانمىلىرىنى كۆرسىتىدۇ"
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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+ Module نى قوزغىتىش\n"
+"--g-fatal-warnigs ھەممە ئاگاھلاندۇرۇشلار خەتەرگە ئايلىندۇ"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "»%s« كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپى نۇمۇر كېرەك"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.c:200
+msgid "No scanners detected"
+msgstr "سكەننېر تېپىلمىدى"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr "سكەننېرنىڭ چېتىقلىقىنى ھەم يېنىقلىقىنى تەكشۈرۈپ بېقىڭ"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr "PDF (كۆپ بەتلىك ھۆججەتلەر)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr "JPEG (پىرسلانغان)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr "PNG (خورىماس)"
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "...گە ساقلاش"
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "رەسىم ھۆججەتلەر"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "بارلىق ھۆججەتلەر"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "ھۆججەتشەكلىنى تاللاش(_T)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "ئارخىپنى ساقلىغىلى بولمىدى"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "رەسىمنى ئالدىن كۆرۈش پروگگراممىسنى قوزغاتقىلى بولمىدى"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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"
+"ئۆزگەرتسىڭىز بۇلىدۇ، ئەمما Free Software Foundation \n"
+"دىن بەلگىلەنگەن GNU General Public نىڭ قائىدىسىگە رىئايە\n"
+"قىلىشىڭىز لازىم: ئۈچۈنچى نۇسخىسىدا ياكى ئۇنىڭ كەينىدىكى \n"
+"بۇسخىسدا.\n"
+"بۇ پروگگرام ھېچقانداق بىر كاپالەتنى ئۈستىگە ئالمايدۇ،\n"
+"ھەم بۇنى سېتشقا كاپالەتلىك قىلمايدۇ، بۇ بىر سىزنىڭ \n"
+"ئشىلتىشىڭىز ئۈچۈن ياسالغان پروگگرام.\n"
+"بۇ توغرىسىدىكى ئۇچۇرلارنى GNU General Public License \n"
+"دىن ئۇقۇڭ.\n"
+"\n"
+"سىز بۇ پروگگىرام بىلەن بىر GNU General Public License\n"
+"نىڭ كوپىسىنى ئېرىشكەن بولىشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
+"<http://www.gnu.org/licenses/> دا تاپالايسىز."
+
+#. Title of about dialog
+#: ../src/ui.c:1274
+msgid "About Simple Scan"
+msgstr "Simple Scan توغرىسىدا"
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr "ئاددى بولغان ھۆججەت سكەنلەش قورالى"
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  azimat https://launchpad.net/~azimat-uigur"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (دەسلەپكى نۇسخا)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (كۆڭۈلدىكى)"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr "ھۆججەت تېپىلمىدى"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr "قاچىلانمىڭىزنى تەكشۈرۈپ بېقىڭ"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "سكەننېرنى ئالماشتۇرۇڭ(_S)"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr "سكەنلىگەن ھۆججەت.pdf"
diff --git a/po/uk.po b/po/uk.po
index c359399..b3ee909 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-15 09:32+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-27 08:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Всі сторінки з _лотка"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Зворот"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Обрізати позначену сторінку"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Передній бік"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Передній і зворотний боки"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Створити"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Розмір сторінки:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Зберегти"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Зберегти документ до файла"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "_Джерело даних сканування:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Бік сканування:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Каталог збережених файлів"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Висота паперу у десятих міліметра"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Висота сканованого зображення у піксел
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Бік сторінки, який слід сканувати"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -339,11 +339,14 @@ msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
+"'back'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -371,6 +374,7 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -388,7 +392,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Ширина паперу у десятих міліметра"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -420,27 +424,22 @@ msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "Сканований документ"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Не вдалося зберегти файл"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -450,7 +449,7 @@ msgstr ""
 "  %s [ПРИСТРІЙ...] — інструмент сканування"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -468,7 +467,7 @@ msgstr ""
 "  --help-gtk                      Показати параметри GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -492,68 +491,88 @@ msgstr ""
 "  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Не вдалося запустити програму для перегляду зображення"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Зберегти як..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Всі файли"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Вибрати _тип файла"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Не вдалося зберегти файл"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Не вдалося запустити програму для перегляду зображення"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -582,65 +601,75 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Yuri Chornoivan https://launchpad.net/~yurchor-gmail"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Не виявлено таких файлів"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "Автоматично"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
diff --git a/po/vi.po b/po/vi.po
index e151d18..cd0f26e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -406,27 +406,22 @@ msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Lỗi khi giao dịch với máy quét hình"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Không lưu được tệp"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -436,7 +431,7 @@ msgstr ""
 "  %s [DEVICE...] - Scanning utility"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -448,7 +443,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -472,68 +467,88 @@ msgstr ""
 "  --g-fatal-warnings              Make all warnings fatal"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, 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.c:231
+#: ../src/ui.c:200
 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.c:233
+#: ../src/ui.c:202
 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"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Lưu thành..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+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.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -550,65 +565,75 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Thiếu các tệp"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Vui lòng kiểm tra lại việc cài đặt"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd39392..9c7254a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-19 07:56+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-13 05:56+0000\n"
 "Last-Translator: Xhacker Liu <liu.dongyuan@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "传送来的所有页面(_F)"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "背面"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "裁剪选中的页面"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "正面"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "正面和背面"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "新建"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "页面大小："
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "保存"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "将文档保存为文件"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "扫描来源(_O)："
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "扫描页面："
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "保存文件的文件夹："
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "纸张的高度 (以 0.1mm 计)"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "所扫描图像的的高度 (以像素计)"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "扫描纸张的哪面"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -331,12 +331,12 @@ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
+msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -360,7 +360,7 @@ msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -375,7 +375,7 @@ msgstr "扫描文档的类型。“文本”适用于文本文档，“照片”
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "纸张的宽度 (以 0.1mm 计)"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -405,27 +405,22 @@ msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "扫描失败"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "扫描的文档"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "保存文件错误"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -435,7 +430,7 @@ msgstr ""
 "  %s [设备...] - 扫描工具"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -453,7 +448,7 @@ msgstr ""
 "  --help-gtk 显示 GTK+ 选项"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -475,68 +470,88 @@ msgstr ""
 "  --g-fatal-warnings  将所有警告置为致命"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "无法打开图像预览软件"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "保存为..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "所有文件"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "保存文件错误"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "无法打开图像预览软件"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -562,16 +577,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -583,50 +598,60 @@ msgstr ""
 "  YunQiang Su https://launchpad.net/~wzssyqa\n"
 "  ZhangCheng https://launchpad.net/~xxzc"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "文件丢失"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "请检查您的安装"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "自动"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 0000000..b32e4e8
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,650 @@
+# Chinese (Traditional) 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-06 16:11+0000\n"
+"Last-Translator: Cheng-Chia Tseng <Unknown>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr "A_6"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "來自進紙匣的所有頁面(_F)"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Back"
+msgstr "背面"
+
+#: ../data/simple-scan.ui.h:13
+msgid "Crop"
+msgstr "裁切"
+
+#: ../data/simple-scan.ui.h:14
+msgid "Crop the selected page"
+msgstr "裁切所選的頁面"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
+msgstr "正面"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
+msgstr "正面與背面"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:20
+msgid "Le_gal"
+msgstr "美規法定尺寸(_G)"
+
+#: ../data/simple-scan.ui.h:21
+msgid "New"
+msgstr "新增"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr "頁面大小："
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:25
+msgid "Photo"
+msgstr "相片"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:27
+msgid "Preferences"
+msgstr "偏好設定"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Left"
+msgstr "向左旋轉"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate Right"
+msgstr "向右旋轉"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Left"
+msgstr "向左旋轉(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:35
+msgid "Rotate _Right"
+msgstr "向右旋轉(_R)"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:37
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "將頁面向左旋轉 (逆時針方向)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:39
+msgid "Rotate the page to the right (clockwise)"
+msgstr "將頁面向右旋轉 (順時針方向)"
+
+#: ../data/simple-scan.ui.h:40
+msgid "Save"
+msgstr "儲存"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
+msgstr "將文件儲存至檔案"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:44
+msgid "Sc_an"
+msgstr "掃描(_A)"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:46
+msgid "Scan"
+msgstr "掃描"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:48
+msgid "Scan S_ource:"
+msgstr "掃描來源(_O)："
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr "掃描面："
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:52
+msgid "Scan a single page from the scanner"
+msgstr "從掃描器掃描單一頁面"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
+msgid "Simple Scan"
+msgstr "簡易掃描"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:56
+msgid "Single _Page"
+msgstr "單一頁面(_P)"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:58
+msgid "Start a new document"
+msgstr "起始一份新文件"
+
+#: ../data/simple-scan.ui.h:59
+msgid "Stop"
+msgstr "停止"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:61
+msgid "Stop the current scan"
+msgstr "停止目前的掃描"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:63
+msgid "Text"
+msgstr "文字"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:65
+msgid "_Authorize"
+msgstr "授權(_A)"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:67
+msgid "_Contents"
+msgstr "內容(_C)"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:69
+msgid "_Crop"
+msgstr "裁切(_C)"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:71
+msgid "_Custom"
+msgstr "自訂(_C)"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:73
+msgid "_Document"
+msgstr "文件(_D)"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:75
+msgid "_Email"
+msgstr "電子郵件(_E)"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:77
+msgid "_Help"
+msgstr "幫助(_H)"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:79
+msgid "_Letter"
+msgstr "美規信紙(_L)"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:81
+msgid "_None"
+msgstr "無(_N)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:83
+msgid "_Page"
+msgstr "頁面(_P)"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:85
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Photo Resolution:"
+msgstr "相片解析度(_P)："
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:89
+msgid "_Rotate Crop"
+msgstr "旋轉裁切區域(_R)"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:91
+msgid "_Stop Scan"
+msgstr "停止掃描(_S)"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:93
+msgid "_Text Resolution:"
+msgstr "文字解析度(_T)："
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:95
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr "掃描文件"
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr "要從哪個裝置掃描"
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr "掃描的方向"
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "Directory to save files to"
+msgstr "儲存檔案的目錄"
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "Height of scanned image in pixels"
+msgstr "掃描影像的高度，單位為像素"
+
+#: ../data/simple-scan.schemas.in.h:6
+msgid "Page side to scan"
+msgstr "要掃描的頁面"
+
+#: ../data/simple-scan.schemas.in.h:7
+msgid "Resolution for photo scans"
+msgstr "相片掃描的解析度"
+
+#: ../data/simple-scan.schemas.in.h:8
+msgid "Resolution for text scans"
+msgstr "文字掃描的解析度"
+
+#: ../data/simple-scan.schemas.in.h:9
+msgid "Resolution of last scanned image"
+msgstr "上次掃描影像的解析度"
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr "取得影像用的 SANE 裝置。"
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr "如果應用程式視窗最大化時為 TRUE"
+
+#: ../data/simple-scan.schemas.in.h:12
+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」(右到左)"
+
+#: ../data/simple-scan.schemas.in.h:13
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "儲存檔案到何目錄。如果沒有設定預的話，設值是「文件」目錄。"
+
+#: ../data/simple-scan.schemas.in.h:14
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
+
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
+
+#: ../data/simple-scan.schemas.in.h:17
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "之前掃描的影像其解析度，單位為 dpi。"
+
+#: ../data/simple-scan.schemas.in.h:18
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "當掃描相片時使用的解析度，單位為 dpi。"
+
+#: ../data/simple-scan.schemas.in.h:19
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "當掃描文字時使用的解析度，單位為 dpi。"
+
+#: ../data/simple-scan.schemas.in.h:20
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
+
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
+msgid "Type of document being scanned"
+msgstr "掃描中文件的類型"
+
+#: ../data/simple-scan.schemas.in.h:23
+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 "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
+
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
+msgid "Width of scanned image in pixels"
+msgstr "掃描影像的寬度，單位為像素"
+
+#: ../data/simple-scan.schemas.in.h:26
+msgid "Window height in pixels"
+msgstr "視窗高度，單位為像素"
+
+#: ../data/simple-scan.schemas.in.h:27
+msgid "Window width in pixels"
+msgstr "視窗寬度，單位為像素"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.c:889
+msgid "No scanners available.  Please connect a scanner."
+msgstr "沒有可用的掃描器。請連接一部掃描器。"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:916
+msgid "Unable to connect to scanner"
+msgstr "無法連接到掃描器"
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:1222
+msgid "Unable to start scan"
+msgstr "無法起始掃描"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
+msgid "Error communicating with scanner"
+msgstr "與掃描器溝通時發生錯誤"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:265
+msgid "Failed to scan"
+msgstr "掃描失敗"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.c:283
+msgid "Scanned Document"
+msgstr "掃描的文件"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:426
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+"用法：\n"
+"  %s [裝置...] - 掃瞄工具"
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:434
+#, 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+ 選項"
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:446
+#, 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=CLASS                   如同視窗管理程式使用的程式類別\n"
+"  --name=NAME                     如同視窗管理程式使用的程式名稱\n"
+"  --screen=SCREEN                 要使用的 X 螢幕\n"
+"  --sync                          讓 X 呼叫同步化\n"
+"  --gtk-module=MODULES            載入額外的 GTK+ 模組\n"
+"  --g-fatal-warnings              將所有警告設為嚴重的"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:151
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "要存取「%s」需要提供使用者名稱與密碼"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.c:200
+msgid "No scanners detected"
+msgstr "沒有偵測到掃描器"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.c:202
+msgid "Please check your scanner is connected and powered on"
+msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.c:382
+msgid "PDF (multi-page document)"
+msgstr "PDF (多頁文件)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.c:384
+msgid "JPEG (compressed)"
+msgstr "JPEG (壓縮)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.c:386
+msgid "PNG (lossless)"
+msgstr "PNG (無損)"
+
+#. Save dialog: Dialog title
+#: ../src/ui.c:398
+msgid "Save As..."
+msgstr "另存新檔..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.c:414
+msgid "Image Files"
+msgstr "影像檔"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.c:421
+msgid "All Files"
+msgstr "所有檔案"
+
+#. 
+#: ../src/ui.c:426
+msgid "Select File _Type"
+msgstr "選取檔案類型(_T)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "儲存檔案失敗"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+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.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "無法開啟影像預覽應用程式"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.c:1245
+msgid "Unable to open help file"
+msgstr "無法開啟幫助文件檔案"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:1260
+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 ""
+"本程式為自由軟體；您可依據自由軟體基金會所發表的 GNU "
+"通用公眾授權條款，對本程式再次發佈和/或修改；無論您依據的是本授權的第三版，或（依您的選擇而定）任何較新的版本。\n"
+"\n"
+"本程式發佈的目的是希望它有用，然而沒有任何保證；亦無對適售性或特定目的適用性所為的暗示性保證。詳情請參照 GNU 通用公眾授權。\n"
+"\n"
+"您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
+
+#. Title of about dialog
+#: ../src/ui.c:1274
+msgid "About Simple Scan"
+msgstr "關於「簡易掃描」"
+
+#. Description of program
+#: ../src/ui.c:1277
+msgid "Simple document scanning tool"
+msgstr "簡易文件掃描工具"
+
+#: ../src/ui.c:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Cheng-Chia Tseng https://launchpad.net/~zerng07"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.c:1448
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (草稿)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.c:1454
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (高解析度)"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.c:1477
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (預設)"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:1522
+msgid "Files missing"
+msgstr "檔案遺失"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:1524
+msgid "Please check your installation"
+msgstr "請檢查您的安裝是否完整"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "變更掃描器(_S)"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "自動"
+
+#: ../src/ui.c:1865
+msgid "Scanned Document.pdf"
+msgstr "掃描的文件.pdf"
diff --git a/src/Makefile.am b/src/Makefile.am
index e6654d0..8a4f587 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@ simple_scan_CFLAGS = \
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
 	-lsane \
+	-ljpeg \
 	-lm
 
 DISTCLEANFILES = \
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index 5665293..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,661 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-bin_PROGRAMS = simple-scan$(EXEEXT)
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_simple_scan_OBJECTS = simple_scan-book.$(OBJEXT) \
-	simple_scan-book-view.$(OBJEXT) simple_scan-page.$(OBJEXT) \
-	simple_scan-page-view.$(OBJEXT) \
-	simple_scan-simple-scan.$(OBJEXT) \
-	simple_scan-scanner.$(OBJEXT) simple_scan-ui.$(OBJEXT)
-simple_scan_OBJECTS = $(am_simple_scan_OBJECTS)
-am__DEPENDENCIES_1 =
-simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1)
-simple_scan_LINK = $(CCLD) $(simple_scan_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(simple_scan_SOURCES)
-DIST_SOURCES = $(simple_scan_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-simple_scan_SOURCES = \
-	book.c \
-	book.h \
-	book-view.c \
-	book-view.h \
-	page.c \
-	page.h \
-	page-view.c \
-	page-view.h \
-	simple-scan.c \
-	scanner.c \
-	scanner.h \
-	ui.c \
-	ui.h
-
-simple_scan_CFLAGS = \
-	$(SIMPLE_SCAN_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DVERSION=\"$(VERSION)\" \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DLOCALE_DIR=\"$(localedir)\" \
-	-DUI_DIR=\"$(datadir)/simple-scan/\" \
-	-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
-	-DGCONF_DIR=\"/apps/simple-scan\" \
-	-DSIMPLE_SCAN_BINARY=\"simple-scan\"
-
-simple_scan_LDADD = \
-	$(SIMPLE_SCAN_LIBS) \
-	-lsane \
-	-lm
-
-DISTCLEANFILES = \
-	Makefile.in
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-simple-scan$(EXEEXT): $(simple_scan_OBJECTS) $(simple_scan_DEPENDENCIES) 
-	@rm -f simple-scan$(EXEEXT)
-	$(AM_V_CCLD)$(simple_scan_LINK) $(simple_scan_OBJECTS) $(simple_scan_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-book-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-book.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-page-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-page.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-simple-scan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-ui.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-simple_scan-book.o: book.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book.o -MD -MP -MF $(DEPDIR)/simple_scan-book.Tpo -c -o simple_scan-book.o `test -f 'book.c' || echo '$(srcdir)/'`book.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book.Tpo $(DEPDIR)/simple_scan-book.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='book.c' object='simple_scan-book.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-book.o `test -f 'book.c' || echo '$(srcdir)/'`book.c
-
-simple_scan-book.obj: book.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book.obj -MD -MP -MF $(DEPDIR)/simple_scan-book.Tpo -c -o simple_scan-book.obj `if test -f 'book.c'; then $(CYGPATH_W) 'book.c'; else $(CYGPATH_W) '$(srcdir)/book.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book.Tpo $(DEPDIR)/simple_scan-book.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='book.c' object='simple_scan-book.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-book.obj `if test -f 'book.c'; then $(CYGPATH_W) 'book.c'; else $(CYGPATH_W) '$(srcdir)/book.c'; fi`
-
-simple_scan-book-view.o: book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book-view.o -MD -MP -MF $(DEPDIR)/simple_scan-book-view.Tpo -c -o simple_scan-book-view.o `test -f 'book-view.c' || echo '$(srcdir)/'`book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book-view.Tpo $(DEPDIR)/simple_scan-book-view.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='book-view.c' object='simple_scan-book-view.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-book-view.o `test -f 'book-view.c' || echo '$(srcdir)/'`book-view.c
-
-simple_scan-book-view.obj: book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book-view.obj -MD -MP -MF $(DEPDIR)/simple_scan-book-view.Tpo -c -o simple_scan-book-view.obj `if test -f 'book-view.c'; then $(CYGPATH_W) 'book-view.c'; else $(CYGPATH_W) '$(srcdir)/book-view.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book-view.Tpo $(DEPDIR)/simple_scan-book-view.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='book-view.c' object='simple_scan-book-view.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-book-view.obj `if test -f 'book-view.c'; then $(CYGPATH_W) 'book-view.c'; else $(CYGPATH_W) '$(srcdir)/book-view.c'; fi`
-
-simple_scan-page.o: page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page.o -MD -MP -MF $(DEPDIR)/simple_scan-page.Tpo -c -o simple_scan-page.o `test -f 'page.c' || echo '$(srcdir)/'`page.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page.Tpo $(DEPDIR)/simple_scan-page.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='page.c' object='simple_scan-page.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-page.o `test -f 'page.c' || echo '$(srcdir)/'`page.c
-
-simple_scan-page.obj: page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page.obj -MD -MP -MF $(DEPDIR)/simple_scan-page.Tpo -c -o simple_scan-page.obj `if test -f 'page.c'; then $(CYGPATH_W) 'page.c'; else $(CYGPATH_W) '$(srcdir)/page.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page.Tpo $(DEPDIR)/simple_scan-page.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='page.c' object='simple_scan-page.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-page.obj `if test -f 'page.c'; then $(CYGPATH_W) 'page.c'; else $(CYGPATH_W) '$(srcdir)/page.c'; fi`
-
-simple_scan-page-view.o: page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page-view.o -MD -MP -MF $(DEPDIR)/simple_scan-page-view.Tpo -c -o simple_scan-page-view.o `test -f 'page-view.c' || echo '$(srcdir)/'`page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page-view.Tpo $(DEPDIR)/simple_scan-page-view.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='page-view.c' object='simple_scan-page-view.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-page-view.o `test -f 'page-view.c' || echo '$(srcdir)/'`page-view.c
-
-simple_scan-page-view.obj: page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page-view.obj -MD -MP -MF $(DEPDIR)/simple_scan-page-view.Tpo -c -o simple_scan-page-view.obj `if test -f 'page-view.c'; then $(CYGPATH_W) 'page-view.c'; else $(CYGPATH_W) '$(srcdir)/page-view.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page-view.Tpo $(DEPDIR)/simple_scan-page-view.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='page-view.c' object='simple_scan-page-view.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-page-view.obj `if test -f 'page-view.c'; then $(CYGPATH_W) 'page-view.c'; else $(CYGPATH_W) '$(srcdir)/page-view.c'; fi`
-
-simple_scan-simple-scan.o: simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-simple-scan.o -MD -MP -MF $(DEPDIR)/simple_scan-simple-scan.Tpo -c -o simple_scan-simple-scan.o `test -f 'simple-scan.c' || echo '$(srcdir)/'`simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-simple-scan.Tpo $(DEPDIR)/simple_scan-simple-scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-scan.c' object='simple_scan-simple-scan.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-simple-scan.o `test -f 'simple-scan.c' || echo '$(srcdir)/'`simple-scan.c
-
-simple_scan-simple-scan.obj: simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-simple-scan.obj -MD -MP -MF $(DEPDIR)/simple_scan-simple-scan.Tpo -c -o simple_scan-simple-scan.obj `if test -f 'simple-scan.c'; then $(CYGPATH_W) 'simple-scan.c'; else $(CYGPATH_W) '$(srcdir)/simple-scan.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-simple-scan.Tpo $(DEPDIR)/simple_scan-simple-scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-scan.c' object='simple_scan-simple-scan.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-simple-scan.obj `if test -f 'simple-scan.c'; then $(CYGPATH_W) 'simple-scan.c'; else $(CYGPATH_W) '$(srcdir)/simple-scan.c'; fi`
-
-simple_scan-scanner.o: scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-scanner.o -MD -MP -MF $(DEPDIR)/simple_scan-scanner.Tpo -c -o simple_scan-scanner.o `test -f 'scanner.c' || echo '$(srcdir)/'`scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-scanner.Tpo $(DEPDIR)/simple_scan-scanner.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='scanner.c' object='simple_scan-scanner.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-scanner.o `test -f 'scanner.c' || echo '$(srcdir)/'`scanner.c
-
-simple_scan-scanner.obj: scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-scanner.obj -MD -MP -MF $(DEPDIR)/simple_scan-scanner.Tpo -c -o simple_scan-scanner.obj `if test -f 'scanner.c'; then $(CYGPATH_W) 'scanner.c'; else $(CYGPATH_W) '$(srcdir)/scanner.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-scanner.Tpo $(DEPDIR)/simple_scan-scanner.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='scanner.c' object='simple_scan-scanner.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-scanner.obj `if test -f 'scanner.c'; then $(CYGPATH_W) 'scanner.c'; else $(CYGPATH_W) '$(srcdir)/scanner.c'; fi`
-
-simple_scan-ui.o: ui.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-ui.o -MD -MP -MF $(DEPDIR)/simple_scan-ui.Tpo -c -o simple_scan-ui.o `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-ui.Tpo $(DEPDIR)/simple_scan-ui.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui.c' object='simple_scan-ui.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-ui.o `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
-
-simple_scan-ui.obj: ui.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-ui.obj -MD -MP -MF $(DEPDIR)/simple_scan-ui.Tpo -c -o simple_scan-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-ui.Tpo $(DEPDIR)/simple_scan-ui.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui.c' object='simple_scan-ui.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/book.c b/src/book.c
index 1c1cc6e..387c7f0 100644
--- a/src/book.c
+++ b/src/book.c
@@ -9,16 +9,22 @@
  * license.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <zlib.h>
+#include <jpeglib.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cairo/cairo-pdf.h>
 #include <cairo/cairo-ps.h>
-#include <unistd.h> // TEMP: Needed for close() in get_temporary_filename()
 
 #include "book.h"
 
+enum {
+    PROP_0,
+    PROP_NEEDS_SAVING
+};
 
 enum {
     PAGE_ADDED,
@@ -31,6 +37,8 @@ static guint signals[LAST_SIGNAL] = { 0, };
 struct BookPrivate
 {
     GList *pages;
+  
+    gboolean needs_saving;
 };
 
 G_DEFINE_TYPE (Book, book, G_TYPE_OBJECT);
@@ -57,17 +65,28 @@ book_clear (Book *book)
 }
 
 
+static void
+page_changed_cb (Page *page, Book *book)
+{
+    book_set_needs_saving (book, TRUE);
+}
+
+
 Page *
 book_append_page (Book *book, gint width, gint height, gint dpi, Orientation orientation)
 {
     Page *page;
 
     page = page_new ();
+    g_signal_connect (page, "image-changed", G_CALLBACK (page_changed_cb), book);
+    g_signal_connect (page, "crop-changed", G_CALLBACK (page_changed_cb), book);
     page_setup (page, width, height, dpi, orientation);
 
     book->priv->pages = g_list_append (book->priv->pages, page);
 
     g_signal_emit (book, signals[PAGE_ADDED], 0, page);
+  
+    book_set_needs_saving (book, TRUE);
 
     return page;
 }
@@ -76,10 +95,14 @@ book_append_page (Book *book, gint width, gint height, gint dpi, Orientation ori
 void
 book_delete_page (Book *book, Page *page)
 {
+    g_signal_handlers_disconnect_by_func (page, page_changed_cb, book);
+
     g_signal_emit (book, signals[PAGE_REMOVED], 0, page);
 
     book->priv->pages = g_list_remove (book->priv->pages, page);
     g_object_unref (page);
+
+    book_set_needs_saving (book, TRUE);
 }
 
 
@@ -218,160 +241,148 @@ book_save_ps (Book *book, GFile *file, GError **error)
 }
 
 
-// TEMP: Copied from simple-scan.c
-static GFile *
-get_temporary_file (const gchar *prefix, const gchar *extension)
+typedef struct
 {
-    gint fd;
-    GFile *file;
-    gchar *filename, *path;
-    GError *error = NULL;
+    int offset;
+    int n_objects;
+    GList *object_offsets;
+    GFileOutputStream *stream;
+} PDFWriter;
 
-    /* NOTE: I'm not sure if this is a 100% safe strategy to use g_file_open_tmp(), close and
-     * use the filename but it appears to work in practise */
 
-    filename = g_strdup_printf ("%s-XXXXXX.%s", prefix, extension);
-    fd = g_file_open_tmp (filename, &path, &error);
-    g_free (filename);
-    if (fd < 0) {
-        g_warning ("Error saving email attachment: %s", error->message);
-        g_clear_error (&error);
-        return NULL;
-    }
-    close (fd);
-  
-    file = g_file_new_for_path (path);
-    g_free (path);
+static PDFWriter *
+pdf_writer_new (GFileOutputStream *stream)
+{
+    PDFWriter *writer;
+    writer = g_malloc0 (sizeof (PDFWriter));
+    writer->stream = g_object_ref (stream);
+    return writer;
+}
 
-    return file;
+
+static void
+pdf_writer_free (PDFWriter *writer)
+{
+    g_object_unref (writer->stream);
+    g_list_free (writer->object_offsets);
+    g_free (writer);
 }
 
 
-static goffset
-get_file_size (GFile *file)
+static void
+pdf_write (PDFWriter *writer, const unsigned char *data, size_t length)
 {
-    GFileInfo *info;
-    goffset size = 0;
-  
-    info = g_file_query_info (file,
-                              G_FILE_ATTRIBUTE_STANDARD_SIZE,
-                              G_FILE_QUERY_INFO_NONE,
-                              NULL,
-                              NULL);
-    if (info) {
-        size = g_file_info_get_size (info);
-        g_object_unref (info);
-    }
+    g_output_stream_write_all (G_OUTPUT_STREAM (writer->stream), data, length, NULL, NULL, NULL);
+    writer->offset += length;
+}
+
 
-    return size;
+static void
+pdf_printf (PDFWriter *writer, const char *format, ...)
+{
+    va_list args;
+    gchar *string;
+
+    va_start (args, format);
+    string = g_strdup_vprintf (format, args);
+    va_end (args);
+    pdf_write (writer, (unsigned char *)string, strlen (string));
+
+    g_free (string);
 }
 
 
-static gboolean
-book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
+static int
+pdf_start_object (PDFWriter *writer)
 {
-    GList *iter;
-    GString *command_line;
-    gboolean result = TRUE;
-    gint exit_status = 0;
-    GFile *output_file = NULL;
-    GList *link, *temporary_files = NULL;
+    writer->n_objects++;
+    writer->object_offsets = g_list_append (writer->object_offsets, GINT_TO_POINTER (writer->offset));
+    return writer->n_objects;
+}
 
-    /* ImageMagick command to create a PDF */
-    command_line = g_string_new ("convert -adjoin");
 
-    /* Save each page to a file */
-    for (iter = book->priv->pages; iter && result; iter = iter->next) {
-        Page *page = iter->data;
-        GFile *jpeg_file, *tiff_file;
-        gchar *path, *resolution_command, *stdout_text = NULL, *stderr_text = NULL;
-        gint jpeg_size, tiff_size;
-
-        jpeg_file = get_temporary_file ("simple-scan", "jpg");
-        result = page_save (page, "jpeg", jpeg_file, error);
-        jpeg_size = get_file_size (jpeg_file);
-        temporary_files = g_list_append (temporary_files, jpeg_file);
-
-        tiff_file = get_temporary_file ("simple-scan", "tiff");
-        result = page_save (page, "tiff", tiff_file, error);
-        tiff_size = get_file_size (tiff_file);
-        temporary_files = g_list_append (temporary_files, tiff_file);
-
-        /* Use the smallest file */
-        if (jpeg_size < tiff_size)
-            path = g_file_get_path (jpeg_file);
-        else
-            path = g_file_get_path (tiff_file);
-
-        resolution_command = g_strdup_printf ("convert %s -density %d %s", path, page_get_dpi (page), path);
-        g_debug ("Executing ImageMagick command: %s", resolution_command);
-        result = g_spawn_command_line_sync (resolution_command, &stdout_text, &stderr_text, &exit_status, error);
-        if (result && exit_status != 0) {
-            g_warning ("ImageMagick returned error code %d, command line was: %s", exit_status, resolution_command);
-            g_warning ("stdout: %s", stdout_text);
-            g_warning ("stderr: %s", stderr_text);
-            result = FALSE;
-            g_set_error (error, BOOK_TYPE, 0,
-                         "ImageMagick returned error code %d\n"
-                         "\n"
-                         "Command line: %s\n"
-                         "Stdout: %s\n"
-                         "Stderr: %s",
-                         exit_status, resolution_command, stdout_text, stderr_text);
-        }
-        if (!result)
+static guchar *
+compress_zlib (guchar *data, size_t length, size_t *n_written)
+{
+    z_stream stream;
+    guchar *out_data;
+
+    out_data = g_malloc (sizeof (guchar) * length);
+
+    stream.zalloc = Z_NULL;
+    stream.zfree = Z_NULL;
+    stream.opaque = Z_NULL;
+    if (deflateInit (&stream, Z_BEST_COMPRESSION) != Z_OK)
+        return NULL;
+
+    stream.next_in = data;
+    stream.avail_in = length;
+    stream.next_out = out_data;
+    stream.avail_out = length;
+    while (stream.avail_in > 0) {
+        if (deflate (&stream, Z_FINISH) == Z_STREAM_ERROR)
             break;
-      
-        g_string_append_printf (command_line, " %s", path);
-        g_free (path);
     }
 
-    /* Use ImageMagick command to create a PDF */  
-    if (result) {
-        gchar *path, *stdout_text = NULL, *stderr_text = NULL;
-
-        output_file = get_temporary_file ("simple-scan", "pdf");
-        path = g_file_get_path (output_file);
-        g_string_append_printf (command_line, " %s", path);
-        g_free (path);
-
-        g_debug ("Executing ImageMagick command: %s", command_line->str);
-        result = g_spawn_command_line_sync (command_line->str, &stdout_text, &stderr_text, &exit_status, error);
-        if (result && exit_status != 0) {
-            g_warning ("ImageMagick returned error code %d, command line was: %s", exit_status, command_line->str);
-            g_warning ("stdout: %s", stdout_text);
-            g_warning ("stderr: %s", stderr_text);
-            result = FALSE;
-            g_set_error (error, BOOK_TYPE, 0,
-                         "ImageMagick returned error code %d\n"
-                         "\n"
-                         "Command line: %s\n"
-                         "Stdout: %s\n"
-                         "Stderr: %s",
-                         exit_status, command_line->str, stdout_text, stderr_text);
-        }
-        g_free (stdout_text);
-        g_free (stderr_text);
+    deflateEnd (&stream);
+
+    if (stream.avail_in > 0) {
+        g_free (out_data);
+        return NULL;
     }
 
-    /* Move to target URI */
-    if (result)
-        result = g_file_move (output_file, file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error);
-  
-    /* Delete page files */
-    for (link = temporary_files; link; link = link->next) {
-        GFile *f = link->data;
+    *n_written = length - stream.avail_out;
+
+    return out_data;
+}
 
-        g_file_delete (f, NULL, NULL);
-        g_object_unref (f);
+
+static void jpeg_init_cb (struct jpeg_compress_struct *info) {}
+static boolean jpeg_empty_cb (struct jpeg_compress_struct *info) { return TRUE; }
+static void jpeg_term_cb (struct jpeg_compress_struct *info) {}
+
+static guchar *
+compress_jpeg (GdkPixbuf *image, size_t *n_written)
+{
+    struct jpeg_compress_struct info;
+    struct jpeg_error_mgr jerr;
+    struct jpeg_destination_mgr dest_mgr;
+    int r;
+    guchar *pixels;
+    guchar *data;
+    size_t max_length;
+
+    info.err = jpeg_std_error (&jerr);
+    jpeg_create_compress (&info);
+
+    pixels = gdk_pixbuf_get_pixels (image);
+    info.image_width = gdk_pixbuf_get_width (image);
+    info.image_height = gdk_pixbuf_get_height (image);
+    info.input_components = 3;
+    info.in_color_space = JCS_RGB; /* TODO: JCS_GRAYSCALE? */
+    jpeg_set_defaults (&info);
+
+    max_length = info.image_width * info.image_height * info.input_components;
+    data = g_malloc (sizeof (guchar) * max_length);
+    dest_mgr.next_output_byte = data;
+    dest_mgr.free_in_buffer = max_length;
+    dest_mgr.init_destination = jpeg_init_cb;
+    dest_mgr.empty_output_buffer = jpeg_empty_cb;
+    dest_mgr.term_destination = jpeg_term_cb;
+    info.dest = &dest_mgr;
+
+    jpeg_start_compress (&info, TRUE);
+    for (r = 0; r < info.image_height; r++) {
+        JSAMPROW row[1];
+        row[0] = pixels + r * gdk_pixbuf_get_rowstride (image);
+        jpeg_write_scanlines (&info, row, 1);
     }
-    g_list_free (temporary_files);
+    jpeg_finish_compress (&info);
+    *n_written = max_length - dest_mgr.free_in_buffer;
 
-    if (output_file)
-        g_object_unref (output_file);
-    g_string_free (command_line, TRUE);
+    jpeg_destroy_compress (&info);
 
-    return result;
+    return data;
 }
 
 
@@ -379,43 +390,249 @@ static gboolean
 book_save_pdf (Book *book, GFile *file, GError **error)
 {
     GFileOutputStream *stream;
-    GList *iter;
-    cairo_surface_t *surface;
-    gchar *imagemagick_executable;
-  
-    /* Use ImageMagick if it is available as then we can compress the images */
-    imagemagick_executable = g_find_program_in_path ("convert");
-    if (imagemagick_executable) {
-        g_free (imagemagick_executable);
-        return book_save_pdf_with_imagemagick (book, file, error);
-    }
+    PDFWriter *writer;
+    int catalog_number, pages_number, info_number;
+    int xref_offset;
+    int i;
 
     stream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, error);
     if (!stream)
         return FALSE;
 
-    surface = cairo_pdf_surface_create_for_stream ((cairo_write_func_t) write_cairo_data,
-                                                   stream, 0, 0);
+    writer = pdf_writer_new (stream);
+    g_object_unref (stream);
 
-    for (iter = book->priv->pages; iter; iter = iter->next) {
-        Page *page = iter->data;
-        double width, height;
+    /* Header */
+    pdf_printf (writer, "%%PDF-1.3\n");
+  
+    /* Catalog */
+    catalog_number = pdf_start_object (writer);
+    pdf_printf (writer, "%d 0 obj\n", catalog_number);
+    pdf_printf (writer, "<<\n");
+    pdf_printf (writer, "/Type /Catalog\n");
+    pdf_printf (writer, "/Pages %d 0 R\n", catalog_number + 1);
+    pdf_printf (writer, ">>\n");
+    pdf_printf (writer, "endobj\n");
+
+    /* Pages */
+    pdf_printf (writer, "\n");
+    pages_number = pdf_start_object (writer);
+    pdf_printf (writer, "%d 0 obj\n", pages_number);
+    pdf_printf (writer, "<<\n");
+    pdf_printf (writer, "/Type /Pages\n");
+    pdf_printf (writer, "/Kids [");
+    for (i = 0; i < book_get_n_pages (book); i++) {
+        pdf_printf (writer, " %d 0 R", pages_number + 1 + (i*3));
+    }
+    pdf_printf (writer, " ]\n");
+    pdf_printf (writer, "/Count %d\n", book_get_n_pages (book));
+    pdf_printf (writer, ">>\n");
+    pdf_printf (writer, "endobj\n");
+
+    for (i = 0; i < book_get_n_pages (book); i++) {
+        int number, width, height, depth;
+        size_t data_length, compressed_length;
+        Page *page;
         GdkPixbuf *image;
-
+        guchar *pixels, *data, *compressed_data;
+        gchar *command;
+        const gchar *color_space, *filter = NULL;
+        float page_width, page_height;
+
+        page = book_get_page (book, i);
+        width = page_get_width (page);
+        height = page_get_height (page);
+        page_width = width * 72. / page_get_dpi (page);
+        page_height = height * 72. / page_get_dpi (page);
         image = page_get_cropped_image (page);
+        pixels = gdk_pixbuf_get_pixels (image);
+
+        if (page_is_color (page)) {
+            int row;
+
+            depth = 8;
+            color_space = "DeviceRGB";
+            data_length = height * width * 3 + 1;
+            data = g_malloc (sizeof (guchar) * data_length);
+            for (row = 0; row < height; row++) {
+                int x;
+                guchar *in_line, *out_line;
+
+                in_line = pixels + row * gdk_pixbuf_get_rowstride (image);
+                out_line = data + row * width * 3;
+                for (x = 0; x < width; x++) {
+                    guchar *in_p = in_line + x*3;
+                    guchar *out_p = out_line + x*3;
+
+                    out_p[0] = in_p[0];
+                    out_p[1] = in_p[1];
+                    out_p[2] = in_p[2];
+                }
+            }
+        }
+        else if (page_get_depth (page) == 1) {
+            int row, offset = 7;
+            guchar *write_ptr;
+
+            depth = 1;
+            color_space = "DeviceGray";
+            data_length = (height * width + 7) / 8;
+            data = g_malloc (sizeof (guchar) * data_length);
+            write_ptr = data;
+            write_ptr[0] = 0;
+            for (row = 0; row < height; row++) {
+                int x;
+                guchar *in_line;
+
+                in_line = pixels + row * gdk_pixbuf_get_rowstride (image);
+                for (x = 0; x < width; x++) {
+                    guchar *in_p = in_line + x*3;
+                    if (in_p[0])
+                        write_ptr[0] |= 1 << offset;
+                    offset--;
+                    if (offset < 0) {
+                        write_ptr++;
+                        write_ptr[0] = 0;
+                        offset = 7;
+                    }
+                }
+            }
+        }
+        else {
+            int row;
+
+            depth = 8;
+            color_space = "DeviceGray";
+            data_length = height * width + 1;
+            data = g_malloc (sizeof (guchar) * data_length);
+            for (row = 0; row < height; row++) {
+                int x;
+                guchar *in_line, *out_line;
+
+                in_line = pixels + row * gdk_pixbuf_get_rowstride (image);
+                out_line = data + row * width;
+                for (x = 0; x < width; x++) {
+                    guchar *in_p = in_line + x*3;
+                    guchar *out_p = out_line + x;
+
+                    out_p[0] = in_p[0];
+                }
+            }
+        }
 
-        width = gdk_pixbuf_get_width (image) * 72.0 / page_get_dpi (page);
-        height = gdk_pixbuf_get_height (image) * 72.0 / page_get_dpi (page);
-        cairo_pdf_surface_set_size (surface, width, height);
-        save_ps_pdf_surface (surface, image, page_get_dpi (page));
-        cairo_surface_show_page (surface);
-        
+        /* Compress data */
+        compressed_data = compress_zlib (data, data_length, &compressed_length);
+        if (compressed_data) {
+            /* Try if JPEG compression is better */
+            if (depth > 1) {
+                guchar *jpeg_data;
+                size_t jpeg_length;
+
+                jpeg_data = compress_jpeg (image, &jpeg_length);
+                if (jpeg_length < compressed_length) {
+                    filter = "DCTDecode";
+                    g_free (data);
+                    g_free (compressed_data);
+                    data = jpeg_data;
+                    data_length = jpeg_length;
+                }
+            }
+
+            if (!filter) {
+                filter = "FlateDecode";
+                g_free (data);
+                data = compressed_data;
+                data_length = compressed_length;
+            }
+        }
+
+        /* Page */
+        pdf_printf (writer, "\n");
+        number = pdf_start_object (writer);
+        pdf_printf (writer, "%d 0 obj\n", number);
+        pdf_printf (writer, "<<\n");
+        pdf_printf (writer, "/Type /Page\n");
+        pdf_printf (writer, "/Parent %d 0 R\n", pages_number);
+        pdf_printf (writer, "/Resources << /XObject << /Im%d %d 0 R >> >>\n", i, number+1);
+        pdf_printf (writer, "/MediaBox [ 0 0 %.2f %.2f ]\n", page_width, page_height);
+        pdf_printf (writer, "/Contents %d 0 R\n", number+2);
+        pdf_printf (writer, ">>\n");
+        pdf_printf (writer, "endobj\n");
+
+        /* Page image */
+        pdf_printf (writer, "\n");
+        number = pdf_start_object (writer);
+        pdf_printf (writer, "%d 0 obj\n", number);
+        pdf_printf (writer, "<<\n");
+        pdf_printf (writer, "/Type /XObject\n");
+        pdf_printf (writer, "/Subtype /Image\n");
+        pdf_printf (writer, "/Width %d\n", width);
+        pdf_printf (writer, "/Height %d\n", height);
+        pdf_printf (writer, "/ColorSpace /%s\n", color_space);
+        pdf_printf (writer, "/BitsPerComponent %d\n", depth);
+        pdf_printf (writer, "/Length %d\n", data_length);
+        if (filter)
+          pdf_printf (writer, "/Filter /%s\n", filter);
+        pdf_printf (writer, ">>\n");
+        pdf_printf (writer, "stream\n");
+        pdf_write (writer, data, data_length);
+        g_free (data);
+        pdf_printf (writer, "\n");
+        pdf_printf (writer, "endstream\n");
+        pdf_printf (writer, "endobj\n");      
+
+        /* Page contents */
+        command = g_strdup_printf ("q\n"
+                                   "%d 0 0 %d 0 0 cm\n"
+                                   "/Im%d Do\n"
+                                   "Q", width, height, i);
+        pdf_printf (writer, "\n");
+        number = pdf_start_object (writer);
+        pdf_printf (writer, "%d 0 obj\n", number);
+        pdf_printf (writer, "<<\n");
+        pdf_printf (writer, "/Length %d\n", strlen (command) + 1);
+        pdf_printf (writer, ">>\n");
+        pdf_printf (writer, "stream\n");
+        pdf_write (writer, (unsigned char *)command, strlen (command));
+        pdf_printf (writer, "\n");
+        pdf_printf (writer, "endstream\n");
+        pdf_printf (writer, "endobj\n");
+        g_free (command);
+                  
         g_object_unref (image);
     }
+  
+    /* Info */
+    pdf_printf (writer, "\n");
+    info_number = pdf_start_object (writer);
+    pdf_printf (writer, "%d 0 obj\n", info_number);
+    pdf_printf (writer, "<<\n");
+    pdf_printf (writer, "/Creator (Simple Scan " VERSION ")\n");
+    pdf_printf (writer, ">>\n");
+    pdf_printf (writer, "endobj\n");
+
+    /* Cross-reference table */
+    xref_offset = writer->offset;
+    pdf_printf (writer, "xref\n");
+    pdf_printf (writer, "1 %d\n", writer->n_objects);
+    GList *link;
+    for (link = writer->object_offsets; link != NULL; link = link->next) {
+        int offset = GPOINTER_TO_INT (link->data);
+        pdf_printf (writer, "%010d 0000 n\n", offset);
+    }
 
-    cairo_surface_destroy (surface);
-
-    g_object_unref (stream);
+    /* Trailer */
+    pdf_printf (writer, "trailer\n");
+    pdf_printf (writer, "<<\n");
+    pdf_printf (writer, "/Size %d\n", writer->n_objects);
+    pdf_printf (writer, "/Info %d 0 R\n", info_number);
+    pdf_printf (writer, "/Root %d 0 R\n", catalog_number);
+    pdf_printf (writer, ">>\n");
+    pdf_printf (writer, "startxref\n");
+    pdf_printf (writer, "%d\n", xref_offset);
+    pdf_printf (writer, "%%%%EOF\n");
+  
+    pdf_writer_free (writer);
 
     return TRUE;
 }
@@ -424,18 +641,79 @@ book_save_pdf (Book *book, GFile *file, GError **error)
 gboolean
 book_save (Book *book, const gchar *type, GFile *file, GError **error)
 {
+    gboolean result = FALSE;
+
     if (strcmp (type, "jpeg") == 0)
-        return book_save_multi_file (book, "jpeg", file, error);
+        result = book_save_multi_file (book, "jpeg", file, error);
     else if (strcmp (type, "png") == 0)
-        return book_save_multi_file (book, "png", file, error);
+        result = book_save_multi_file (book, "png", file, error);
     else if (strcmp (type, "tiff") == 0)
-        return book_save_multi_file (book, "tiff", file, error);    
+        result = book_save_multi_file (book, "tiff", file, error);    
     else if (strcmp (type, "ps") == 0)
-        return book_save_ps (book, file, error);    
+        result = book_save_ps (book, file, error);    
     else if (strcmp (type, "pdf") == 0)
-        return book_save_pdf (book, file, error);
-    else
-        return FALSE;
+        result = book_save_pdf (book, file, error);
+
+    return result;
+}
+
+
+void
+book_set_needs_saving (Book *book, gboolean needs_saving)
+{
+    gboolean needed_saving = book->priv->needs_saving;
+    book->priv->needs_saving = needs_saving;
+    if (needed_saving != needs_saving)
+        g_object_notify (G_OBJECT (book), "needs-saving");
+}
+
+
+gboolean
+book_get_needs_saving (Book *book)
+{
+    return book->priv->needs_saving;
+}
+
+
+static void
+book_set_property (GObject      *object,
+                   guint         prop_id,
+                   const GValue *value,
+                   GParamSpec   *pspec)
+{
+    Book *self;
+
+    self = BOOK (object);
+
+    switch (prop_id) {
+    case PROP_NEEDS_SAVING:
+        book_set_needs_saving (self, g_value_get_boolean (value));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+
+static void
+book_get_property (GObject    *object,
+                   guint       prop_id,
+                   GValue     *value,
+                   GParamSpec *pspec)
+{
+    Book *self;
+
+    self = BOOK (object);
+
+    switch (prop_id) {
+    case PROP_NEEDS_SAVING:
+        g_value_set_boolean (value, book_get_needs_saving (self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
 }
 
 
@@ -453,8 +731,18 @@ book_class_init (BookClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+    object_class->get_property = book_get_property;
+    object_class->set_property = book_set_property;
     object_class->finalize = book_finalize;
 
+    g_object_class_install_property (object_class,
+                                     PROP_NEEDS_SAVING,
+                                     g_param_spec_boolean ("needs-saving",
+                                                           "needs-saving",
+                                                           "TRUE if this book needs saving",
+                                                           FALSE,
+                                                           G_PARAM_READWRITE));
+
     signals[PAGE_ADDED] =
         g_signal_new ("page-added",
                       G_TYPE_FROM_CLASS (klass),
diff --git a/src/book.h b/src/book.h
index 4e9e05e..f8fc747 100644
--- a/src/book.h
+++ b/src/book.h
@@ -57,4 +57,8 @@ Page *book_get_page (Book *book, gint page_number);
 
 gboolean book_save (Book *book, const gchar *type, GFile *file, GError **error);
 
+void book_set_needs_saving (Book *book, gboolean needs_saving);
+
+gboolean book_get_needs_saving (Book *book);
+
 #endif /* _BOOK_H_ */
diff --git a/src/page.c b/src/page.c
index 5888a46..655b43b 100644
--- a/src/page.c
+++ b/src/page.c
@@ -31,6 +31,9 @@ struct PagePrivate
     /* Number of rows in this page or -1 if currently unknown */
     gint rows;
 
+    /* Bit depth */
+    gint depth;
+
     /* Color profile */
     gchar *color_profile;
 
@@ -43,6 +46,9 @@ struct PagePrivate
     /* TRUE if have some page data */
     gboolean has_data;
 
+    /* TRUE if have color data */
+    gboolean is_color;
+
     /* Expected next scan row */
     gint scan_line;
 
@@ -179,6 +185,21 @@ gboolean page_has_data (Page *page)
 }
 
 
+gboolean page_is_color (Page *page)
+{
+    g_return_val_if_fail (page != NULL, FALSE);
+    return page->priv->is_color;
+}
+
+
+gint
+page_get_depth (Page *page)
+{
+    g_return_val_if_fail (page != NULL, 0);
+    return page->priv->depth;
+}
+
+
 gint page_get_scan_line (Page *page)
 {
     g_return_val_if_fail (page != NULL, -1);
@@ -191,7 +212,7 @@ set_pixel (ScanLine *line, gint n, gint x, guchar *pixel)
 {
     gint sample;
     guchar *data;
-  
+
     data = line->data + line->data_length * n;
 
     switch (line->format) {
@@ -231,6 +252,11 @@ parse_line (Page *page, ScanLine *line, gint n, gboolean *size_changed)
 
     line_number = line->number + n;
 
+    if (line->format != LINE_GRAY)
+        page->priv->is_color = TRUE;
+    if (line->depth > page->priv->depth)
+        page->priv->depth = line->depth;
+
     /* Extend image if necessary */
     while (line_number >= page_get_scan_height (page)) {
         GdkPixbuf *image;
diff --git a/src/page.h b/src/page.h
index b36fe32..25e3018 100644
--- a/src/page.h
+++ b/src/page.h
@@ -82,6 +82,10 @@ gboolean page_is_scanning (Page *page);
 
 gboolean page_has_data (Page *page);
 
+gboolean page_is_color (Page *page);
+
+gint page_get_depth (Page *page);
+
 gint page_get_scan_line (Page *page);
 
 void page_parse_scan_line (Page *page, ScanLine *line);
diff --git a/src/scanner.c b/src/scanner.c
index a8d09f9..8383f9f 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -792,7 +792,7 @@ close_device (Scanner *scanner)
         g_debug ("sane_close ()");
         scanner->priv->handle = NULL;
     }
-  
+
     g_free (scanner->priv->buffer);
     scanner->priv->buffer = NULL;
 
@@ -1320,10 +1320,12 @@ do_read (Scanner *scanner)
                         n_to_read, &n_read);
     g_debug ("sane_read (%d) -> (%s, %d)", n_to_read, get_status_string (status), n_read);
 
-    /* End of variable length frame */
-    if (status == SANE_STATUS_EOF &&
-        scanner->priv->parameters.lines == -1 &&
-        scanner->priv->bytes_remaining == scanner->priv->parameters.bytes_per_line) {
+    /* Completed read */
+    if (status == SANE_STATUS_EOF) {
+        if (scanner->priv->parameters.lines > 0 && scanner->priv->line_count != scanner->priv->parameters.lines)
+            g_warning ("Scan completed with %d lines, expected %d lines", scanner->priv->parameters.lines, scanner->priv->parameters.lines);
+        if (scanner->priv->n_used > 0)
+            g_warning ("Scan complete with %d bytes of unused data", scanner->priv->n_used);
         do_complete_page (scanner);
         return;
     }
@@ -1344,6 +1346,7 @@ do_read (Scanner *scanner)
     /* Feed out lines */
     if (scanner->priv->n_used >= scanner->priv->parameters.bytes_per_line) {
         ScanLine *line;
+        int i, n_remaining;
 
         line = g_malloc(sizeof(ScanLine));
         switch (scanner->priv->parameters.format) {
@@ -1373,27 +1376,18 @@ do_read (Scanner *scanner)
         scanner->priv->buffer = NULL;
         scanner->priv->line_count += line->n_lines;
 
-        /* On last line */
-        if (scanner->priv->parameters.lines > 0 && scanner->priv->line_count >= scanner->priv->parameters.lines) {
-            emit_signal (scanner, GOT_LINE, line);
-            do_complete_page (scanner);
-        }
-        else {
-            int i, n_remaining;
-
-            /* Increase buffer size if did full read */
-            if (full_read)
-                scanner->priv->buffer_size += scanner->priv->parameters.bytes_per_line;
-
-            scanner->priv->buffer = g_malloc(sizeof(SANE_Byte) * scanner->priv->buffer_size);
-            n_remaining = scanner->priv->n_used - (line->n_lines * line->data_length);
-            scanner->priv->n_used = 0;
-            for (i = 0; i < n_remaining; i++) {
-                scanner->priv->buffer[i] = line->data[i + (line->n_lines * line->data_length)];
-                scanner->priv->n_used++;                
-            }
-            emit_signal (scanner, GOT_LINE, line);
+        /* Increase buffer size if did full read */
+        if (full_read)
+            scanner->priv->buffer_size += scanner->priv->parameters.bytes_per_line;
+
+        scanner->priv->buffer = g_malloc(sizeof(SANE_Byte) * scanner->priv->buffer_size);
+        n_remaining = scanner->priv->n_used - (line->n_lines * line->data_length);
+        scanner->priv->n_used = 0;
+        for (i = 0; i < n_remaining; i++) {
+            scanner->priv->buffer[i] = line->data[i + (line->n_lines * line->data_length)];
+            scanner->priv->n_used++;
         }
+        emit_signal (scanner, GOT_LINE, line);
     }
 }
 
diff --git a/src/simple-scan.c b/src/simple-scan.c
index b8c3962..54236ae 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -26,6 +26,8 @@
 
 static ScanDevice *default_device = NULL;
 
+static gboolean have_devices = FALSE;
+
 static GUdevClient *udev_client;
 
 static SimpleScan *ui;
@@ -62,6 +64,7 @@ update_scan_devices_cb (Scanner *scanner, GList *devices)
             devices_copy = g_list_prepend (devices_copy, default_device);
     }
 
+    have_devices = devices_copy != NULL;
     ui_set_scan_devices (ui, devices_copy);
   
     g_list_free (devices_copy);
@@ -261,7 +264,7 @@ scanner_failed_cb (Scanner *scanner, GError *error)
                        /* Title of error dialog when scan failed */
                        _("Failed to scan"),
                        error->message,
-                       TRUE);
+                       have_devices);
     }
 }
 
@@ -305,54 +308,6 @@ cancel_cb (SimpleScan *ui)
 }
 
 
-static gboolean
-save_book_by_extension (GFile *file, GError **error)
-{
-    gboolean result;
-    gchar *uri, *uri_lower;
-
-    uri = g_file_get_uri (file);
-    uri_lower = g_utf8_strdown (uri, -1);
-    if (g_str_has_suffix (uri_lower, ".pdf"))
-        result = book_save (book, "pdf", file, error);
-    else if (g_str_has_suffix (uri_lower, ".ps"))
-        result = book_save (book, "ps", file, error);
-    else if (g_str_has_suffix (uri_lower, ".png"))
-        result = book_save (book, "png", file, error);
-    else if (g_str_has_suffix (uri_lower, ".tif") || g_str_has_suffix (uri_lower, ".tiff"))
-        result = book_save (book, "tiff", file, error);
-    else
-        result = book_save (book, "jpeg", file, error);
-
-    g_free (uri);
-    g_free (uri_lower);
-
-    return result;
-}
-
-
-static void
-save_cb (SimpleScan *ui, const gchar *uri)
-{
-    GError *error = NULL;
-    GFile *file;
-
-    g_debug ("Saving to '%s'", uri);
-
-    file = g_file_new_for_uri (uri);
-    if (!save_book_by_extension (file, &error)) {
-        g_warning ("Error saving file: %s", error->message);
-        ui_show_error (ui,
-                       /* Title of error dialog when save failed */
-                       _("Failed to save file"),
-                       error->message,
-               FALSE);
-        g_error_free (error);
-    }
-    g_object_unref (file);
-}
-
-
 static gchar *
 get_temporary_filename (const gchar *prefix, const gchar *extension)
 {
@@ -625,7 +580,6 @@ main (int argc, char **argv)
     book = ui_get_book (ui);
     g_signal_connect (ui, "start-scan", G_CALLBACK (scan_cb), NULL);
     g_signal_connect (ui, "stop-scan", G_CALLBACK (cancel_cb), NULL);
-    g_signal_connect (ui, "save", G_CALLBACK (save_cb), NULL);
     g_signal_connect (ui, "email", G_CALLBACK (email_cb), NULL);
     g_signal_connect (ui, "quit", G_CALLBACK (quit_cb), NULL);
 
diff --git a/src/ui.c b/src/ui.c
index d67ee5e..0d23d25 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -28,7 +28,6 @@
 enum {
     START_SCAN,
     STOP_SCAN,
-    SAVE,
     EMAIL,
     QUIT,
     LAST_SIGNAL
@@ -43,7 +42,10 @@ struct SimpleScanPrivate
     GtkBuilder *builder;
 
     GtkWidget *window, *main_vbox;
+    GtkWidget *info_bar, *info_bar_image, *info_bar_label;
+    GtkWidget *info_bar_close_button, *info_bar_change_scanner_button;
     GtkWidget *page_delete_menuitem, *crop_rotate_menuitem;
+    GtkWidget *save_menuitem, *save_as_menuitem, *save_toolbutton;
     GtkWidget *stop_menuitem, *stop_toolbutton;
 
     GtkWidget *text_toolbar_menuitem, *text_menu_menuitem;
@@ -58,14 +60,18 @@ struct SimpleScanPrivate
     GtkTreeModel *device_model, *text_dpi_model, *photo_dpi_model, *page_side_model, *paper_size_model;
     gboolean setting_devices, user_selected_device;
 
+    gboolean have_error;
+    gchar *error_title, *error_text;
+    gboolean error_change_scanner_hint;
+
     Book *book;
+    gchar *book_uri;
+  
     BookView *book_view;
     gboolean updating_page_menu;
     gint default_page_width, default_page_height, default_page_dpi;
     Orientation default_page_orientation;
   
-    gboolean have_device_list;
-
     gchar *document_hint;
 
     gchar *default_file_name;
@@ -110,6 +116,22 @@ find_scan_device (SimpleScan *ui, const char *device, GtkTreeIter *iter)
 }
 
 
+static void
+show_error_dialog (SimpleScan *ui, const char *error_title, const char *error_text)
+{
+    GtkWidget *dialog;
+
+    dialog = gtk_message_dialog_new (GTK_WINDOW (ui->priv->window),
+                                     GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_WARNING,
+                                     GTK_BUTTONS_NONE,
+                                     "%s", error_title);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, 0);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error_text);
+    gtk_widget_destroy (dialog);
+}
+
+
 void
 ui_set_default_file_name (SimpleScan *ui, const gchar *default_file_name)
 {
@@ -154,6 +176,47 @@ device_combo_changed_cb (GtkWidget *widget, SimpleScan *ui)
 }
 
 
+static void
+update_info_bar (SimpleScan *ui)
+{
+    GtkMessageType type;
+    const gchar *title, *text, *image_id;
+    gchar *message;
+    gboolean show_close_button = FALSE;
+    gboolean show_change_scanner_button = FALSE;
+  
+    if (ui->priv->have_error)  {
+        type = GTK_MESSAGE_ERROR;
+        image_id = GTK_STOCK_DIALOG_ERROR;
+        title = ui->priv->error_title;
+        text = ui->priv->error_text;
+        show_close_button = TRUE;
+        show_change_scanner_button = ui->priv->error_change_scanner_hint;
+    }
+    else if (gtk_tree_model_iter_n_children (ui->priv->device_model, NULL) == 0) {
+        type = GTK_MESSAGE_WARNING;
+        image_id = GTK_STOCK_DIALOG_WARNING;
+        /* Warning displayed when no scanners are detected */
+        title = _("No scanners detected");
+        /* Hint to user on why there are no scanners detected */
+        text = _("Please check your scanner is connected and powered on");
+    }
+    else {
+        gtk_widget_hide (ui->priv->info_bar);
+        return;
+    }
+
+    gtk_info_bar_set_message_type (GTK_INFO_BAR (ui->priv->info_bar), type);
+    gtk_image_set_from_stock (GTK_IMAGE (ui->priv->info_bar_image), image_id, GTK_ICON_SIZE_DIALOG);
+    message = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", title, text);
+    gtk_label_set_markup (GTK_LABEL (ui->priv->info_bar_label), message);
+    g_free (message);
+    gtk_widget_set_visible (ui->priv->info_bar_close_button, show_close_button);  
+    gtk_widget_set_visible (ui->priv->info_bar_change_scanner_button, show_change_scanner_button);
+    gtk_widget_show (ui->priv->info_bar);
+}
+
+
 void
 ui_set_scan_devices (SimpleScan *ui, GList *devices)
 {
@@ -222,18 +285,7 @@ ui_set_scan_devices (SimpleScan *ui, GList *devices)
 
     ui->priv->setting_devices = FALSE;
 
-    if (!ui->priv->have_device_list) {
-        ui->priv->have_device_list = TRUE;
-
-        if (!devices) {
-            ui_show_error (ui,
-                           /* Warning displayed when no scanners are detected */
-                           _("No scanners detected"),
-                           /* Hint to user on why there are no scanners detected */
-                           _("Please check your scanner is connected and powered on"),
-                           FALSE);
-        }
-    }
+    update_info_bar (ui);
 }
 
 
@@ -279,13 +331,272 @@ add_default_page (SimpleScan *ui)
 }
 
 
+static void
+on_file_type_changed (GtkTreeSelection *selection, GtkWidget *dialog)
+{
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    gchar *path, *filename, *extension, *new_filename;
+
+    if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+        return;
+
+    gtk_tree_model_get (model, &iter, 1, &extension, -1);
+    path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+    filename = g_path_get_basename (path);
+
+    /* Replace extension */
+    if (g_strrstr (filename, "."))
+        new_filename = g_strdup_printf ("%.*s%s", (int)(g_strrstr (filename, ".") - filename), filename, extension);
+    else
+        new_filename = g_strdup_printf ("%s%s", filename, extension);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), new_filename);
+
+    g_free (path);
+    g_free (filename);
+    g_free (new_filename);
+    g_free (extension);
+}
+
+
+static gchar *
+choose_file_location (SimpleScan *ui)
+{
+    GtkWidget *dialog;
+    gint response;
+    GtkFileFilter *filter;
+    GtkWidget *expander, *file_type_view;
+    GtkListStore *file_type_store;
+    GtkTreeIter iter;
+    GtkTreeViewColumn *column;
+    const gchar *extension;
+    gchar *directory, *uri = NULL;
+    gint i;
+
+    struct
+    {
+        gchar *label, *extension;
+    } file_types[] =
+    {
+        /* Save dialog: Label for saving in PDF format */
+        { _("PDF (multi-page document)"), ".pdf" },
+        /* Save dialog: Label for saving in JPEG format */
+        { _("JPEG (compressed)"), ".jpg" },
+        /* Save dialog: Label for saving in PNG format */
+        { _("PNG (lossless)"), ".png" },
+        { NULL, NULL }
+    };
+
+    /* Get directory to save to */
+    directory = gconf_client_get_string (ui->priv->client, GCONF_DIR "/save_directory", NULL);
+    if (!directory || directory[0] == '\0') {
+        g_free (directory);
+        directory = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+    }
+
+    dialog = gtk_file_chooser_dialog_new (/* Save dialog: Dialog title */
+                                          _("Save As..."),
+                                          GTK_WINDOW (ui->priv->window),
+                                          GTK_FILE_CHOOSER_ACTION_SAVE,
+                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                          GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                          NULL);
+    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE);
+    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), directory);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), ui->priv->default_file_name);
+    g_free (directory);
+
+    /* Filter to only show images by default */
+    filter = gtk_file_filter_new ();
+    gtk_file_filter_set_name (filter,
+                              /* Save dialog: Filter name to show only image files */
+                              _("Image Files"));
+    gtk_file_filter_add_pixbuf_formats (filter);
+    gtk_file_filter_add_mime_type (filter, "application/pdf");
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+    filter = gtk_file_filter_new ();
+    gtk_file_filter_set_name (filter,
+                              /* Save dialog: Filter name to show all files */
+                              _("All Files"));
+    gtk_file_filter_add_pattern (filter, "*");
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+    expander = gtk_expander_new_with_mnemonic (/* */
+                                 _("Select File _Type"));
+    gtk_expander_set_spacing (GTK_EXPANDER (expander), 5);
+    gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), expander);
+  
+    extension = strstr (ui->priv->default_file_name, ".");
+    if (!extension)
+        extension = "";
+
+    file_type_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+    for (i = 0; file_types[i].label; i++) {
+        gtk_list_store_append (file_type_store, &iter);
+        gtk_list_store_set (file_type_store, &iter, 0, file_types[i].label, 1, file_types[i].extension, -1);
+    }
+
+    file_type_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (file_type_store));
+    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (file_type_view), FALSE);
+    gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (file_type_view), TRUE);
+    column = gtk_tree_view_column_new_with_attributes ("",
+                                                       gtk_cell_renderer_text_new (),
+                                                       "text", 0, NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (file_type_view), column);
+    gtk_container_add (GTK_CONTAINER (expander), file_type_view);
+
+    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (file_type_store), &iter)) {
+        do {
+            gchar *e;
+            gtk_tree_model_get (GTK_TREE_MODEL (file_type_store), &iter, 1, &e, -1);
+            if (strcmp (extension, e) == 0)
+                gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (file_type_view)), &iter);
+            g_free (e);
+        } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (file_type_store), &iter));
+    }
+    g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (file_type_view)),
+                      "changed",
+                      G_CALLBACK (on_file_type_changed),
+                      dialog);
+
+    gtk_widget_show_all (expander);
+
+    response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+    if (response == GTK_RESPONSE_ACCEPT)
+        uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+
+    gconf_client_set_string (ui->priv->client, GCONF_DIR "/save_directory",
+                             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)),
+                             NULL);
+
+    gtk_widget_destroy (dialog);
+
+    return uri;
+}
+
+
+static gboolean
+save_document (SimpleScan *ui, gboolean force_choose_location)
+{
+    gboolean result;
+    gchar *uri, *uri_lower;
+    GError *error = NULL;
+    GFile *file;
+  
+    if (ui->priv->book_uri && !force_choose_location)
+        uri = g_strdup (ui->priv->book_uri);
+    else
+        uri = choose_file_location (ui);
+    if (!uri)
+        return FALSE;
+
+    file = g_file_new_for_uri (uri);
+
+    g_debug ("Saving to '%s'", uri);
+
+    uri_lower = g_utf8_strdown (uri, -1);
+    if (g_str_has_suffix (uri_lower, ".pdf"))
+        result = book_save (ui->priv->book, "pdf", file, &error);
+    else if (g_str_has_suffix (uri_lower, ".ps"))
+        result = book_save (ui->priv->book, "ps", file, &error);
+    else if (g_str_has_suffix (uri_lower, ".png"))
+        result = book_save (ui->priv->book, "png", file, &error);
+    else if (g_str_has_suffix (uri_lower, ".tif") || g_str_has_suffix (uri_lower, ".tiff"))
+        result = book_save (ui->priv->book, "tiff", file, &error);
+    else
+        result = book_save (ui->priv->book, "jpeg", file, &error);
+
+    g_free (uri_lower);
+
+    if (result) {
+        g_free (ui->priv->book_uri);
+        ui->priv->book_uri = uri;
+        book_set_needs_saving (ui->priv->book, FALSE);
+    }
+    else {
+        g_free (uri);
+
+        g_warning ("Error saving file: %s", error->message);
+        ui_show_error (ui,
+                       /* Title of error dialog when save failed */
+                       _("Failed to save file"),
+                       error->message,
+                       FALSE);
+        g_clear_error (&error);
+    }
+
+    g_object_unref (file);
+
+    return result;
+}
+
+
+static gboolean
+prompt_to_save (SimpleScan *ui, const gchar *title, const gchar *discard_label)
+{
+    GtkWidget *dialog;
+    gint response;
+
+    if (!book_get_needs_saving (ui->priv->book))
+        return TRUE;
+
+    dialog = gtk_message_dialog_new (GTK_WINDOW (ui->priv->window),
+                                     GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_WARNING,
+                                     GTK_BUTTONS_NONE,
+                                     "%s", title);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
+                                              /* Text in dialog warning when a document is about to be lost*/
+                                              _("If you don't save, changes will be permanently lost."));
+    gtk_dialog_add_button (GTK_DIALOG (dialog), discard_label, GTK_RESPONSE_NO);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_SAVE, GTK_RESPONSE_YES);
+
+    response = gtk_dialog_run (GTK_DIALOG (dialog));
+    gtk_widget_destroy (dialog);
+  
+    switch (response) {
+    case GTK_RESPONSE_YES:
+        if (save_document (ui, FALSE))
+            return TRUE;
+        else
+            return FALSE;
+    case GTK_RESPONSE_CANCEL:
+        return FALSE;
+    case GTK_RESPONSE_NO:      
+    default:
+        return TRUE;
+    }
+}
+
+
+static void
+clear_document (SimpleScan *ui)
+{
+    book_clear (ui->priv->book);
+    add_default_page (ui);
+    g_free (ui->priv->book_uri);
+    ui->priv->book_uri = NULL;
+    book_set_needs_saving (ui->priv->book, FALSE);
+    gtk_widget_set_sensitive (ui->priv->save_as_menuitem, FALSE);
+}
+
+
 void new_button_clicked_cb (GtkWidget *widget, SimpleScan *ui);
 G_MODULE_EXPORT
 void
 new_button_clicked_cb (GtkWidget *widget, SimpleScan *ui)
 {
-    book_clear (ui->priv->book);
-    add_default_page (ui);
+    if (!prompt_to_save (ui,
+                         /* Text in dialog warning when a document is about to be lost */
+                         _("Save current document?"),
+                         /* Button in dialog to create new document and discard unsaved document */
+                         _("Discard Changes")))
+        return;
+
+    clear_document (ui);
 }
 
 
@@ -633,11 +944,10 @@ show_page_cb (BookView *view, Page *page, SimpleScan *ui)
     g_object_unref (file);
 
     if (error) {
-        ui_show_error (ui,
-                       /* Error message display when unable to preview image */
-                       _("Unable to open image preview application"),
-                       error->message,
-                       FALSE);
+        show_error_dialog (ui,
+                           /* Error message display when unable to preview image */
+                           _("Unable to open image preview application"),
+                           error->message);
         g_clear_error (&error);
     }
 }
@@ -835,154 +1145,21 @@ page_delete_menuitem_activate_cb (GtkWidget *widget, SimpleScan *ui)
 }
 
 
-static void
-on_file_type_changed (GtkTreeSelection *selection, GtkWidget *dialog)
-{
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    gchar *path, *filename, *extension, *new_filename;
-
-    if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-        return;
-
-    gtk_tree_model_get (model, &iter, 1, &extension, -1);
-    path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-    filename = g_path_get_basename (path);
-
-    /* Replace extension */
-    if (g_strrstr (filename, "."))
-        new_filename = g_strdup_printf ("%.*s%s", (int)(g_strrstr (filename, ".") - filename), filename, extension);
-    else
-        new_filename = g_strdup_printf ("%s%s", filename, extension);
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), new_filename);
-
-    g_free (path);
-    g_free (filename);
-    g_free (new_filename);
-    g_free (extension);
-}
-
-
 void save_file_button_clicked_cb (GtkWidget *widget, SimpleScan *ui);
 G_MODULE_EXPORT
 void
 save_file_button_clicked_cb (GtkWidget *widget, SimpleScan *ui)
 {
-    GtkWidget *dialog;
-    gint response;
-    GtkFileFilter *filter;
-    GtkWidget *expander, *file_type_view;
-    GtkListStore *file_type_store;
-    GtkTreeIter iter;
-    GtkTreeViewColumn *column;
-    const gchar *extension;
-    gchar *directory;
-    gint i;
-
-    struct
-    {
-        gchar *label, *extension;
-    } file_types[] =
-    {
-        /* Save dialog: Label for saving in PDF format */
-        { _("PDF (multi-page document)"), ".pdf" },
-        /* Save dialog: Label for saving in JPEG format */
-        { _("JPEG (compressed)"), ".jpg" },
-        /* Save dialog: Label for saving in PNG format */
-        { _("PNG (lossless)"), ".png" },
-        { NULL, NULL }
-    };
-
-    /* Get directory to save to */
-    directory = gconf_client_get_string (ui->priv->client, GCONF_DIR "/save_directory", NULL);
-    if (!directory || directory[0] == '\0') {
-        g_free (directory);
-        directory = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
-    }
-
-    dialog = gtk_file_chooser_dialog_new (/* Save dialog: Dialog title */
-                                          _("Save As..."),
-                                          GTK_WINDOW (ui->priv->window),
-                                          GTK_FILE_CHOOSER_ACTION_SAVE,
-                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                          GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-                                          NULL);
-    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
-    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE);
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), directory);
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), ui->priv->default_file_name);
-    g_free (directory);
-
-    /* Filter to only show images by default */
-    filter = gtk_file_filter_new ();
-    gtk_file_filter_set_name (filter,
-                              /* Save dialog: Filter name to show only image files */
-                              _("Image Files"));
-    gtk_file_filter_add_pixbuf_formats (filter);
-    gtk_file_filter_add_mime_type (filter, "application/pdf");
-    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-    filter = gtk_file_filter_new ();
-    gtk_file_filter_set_name (filter,
-                              /* Save dialog: Filter name to show all files */
-                              _("All Files"));
-    gtk_file_filter_add_pattern (filter, "*");
-    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-    expander = gtk_expander_new_with_mnemonic (/* */
-                                 _("Select File _Type"));
-    gtk_expander_set_spacing (GTK_EXPANDER (expander), 5);
-    gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), expander);
-  
-    extension = strstr (ui->priv->default_file_name, ".");
-    if (!extension)
-        extension = "";
-
-    file_type_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-    for (i = 0; file_types[i].label; i++) {
-        gtk_list_store_append (file_type_store, &iter);
-        gtk_list_store_set (file_type_store, &iter, 0, file_types[i].label, 1, file_types[i].extension, -1);
-    }
-
-    file_type_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (file_type_store));
-    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (file_type_view), FALSE);
-    gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (file_type_view), TRUE);
-    column = gtk_tree_view_column_new_with_attributes ("",
-                                                       gtk_cell_renderer_text_new (),
-                                                       "text", 0, NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (file_type_view), column);
-    gtk_container_add (GTK_CONTAINER (expander), file_type_view);
-
-    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (file_type_store), &iter)) {
-        do {
-            gchar *e;
-            gtk_tree_model_get (GTK_TREE_MODEL (file_type_store), &iter, 1, &e, -1);
-            if (strcmp (extension, e) == 0)
-                gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (file_type_view)), &iter);
-            g_free (e);
-        } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (file_type_store), &iter));
-    }
-    g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (file_type_view)),
-                      "changed",
-                      G_CALLBACK (on_file_type_changed),
-                      dialog);
-
-    gtk_widget_show_all (expander);
-
-    response = gtk_dialog_run (GTK_DIALOG (dialog));
-    if (response == GTK_RESPONSE_ACCEPT) {
-        gchar *uri;
-
-        uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-        g_signal_emit (G_OBJECT (ui), signals[SAVE], 0, uri);
+    save_document (ui, FALSE);
+}
 
-        g_free (uri);
-    }
 
-    gconf_client_set_string (ui->priv->client, GCONF_DIR "/save_directory",
-                             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)),
-                             NULL);
-  
-    gtk_widget_destroy (dialog);
+void save_as_file_button_clicked_cb (GtkWidget *widget, SimpleScan *ui);
+G_MODULE_EXPORT
+void
+save_as_file_button_clicked_cb (GtkWidget *widget, SimpleScan *ui)
+{
+    save_document (ui, TRUE);
 }
 
 
@@ -1063,11 +1240,10 @@ help_contents_menuitem_activate_cb (GtkWidget *widget, SimpleScan *ui)
 
     if (error)
     {
-        ui_show_error (ui,
-                       /* Error message displayed when unable to launch help browser */
-                       _("Unable to open help file"),
-                       error->message,
-                      FALSE);
+        show_error_dialog (ui,
+                           /* Error message displayed when unable to launch help browser */
+                           _("Unable to open help file"),
+                           error->message);
         g_clear_error (&error);
     }
 }
@@ -1116,14 +1292,19 @@ about_menuitem_activate_cb (GtkWidget *widget, SimpleScan *ui)
 }
 
 
-static void
+static gboolean
 quit (SimpleScan *ui)
 {
     char *device;
     gint paper_width = 0, paper_height = 0;
     gint i;
 
-    // FIXME: Warn if document with unsaved changes
+    if (!prompt_to_save (ui,
+                         /* Text in dialog warning when a document is about to be lost */
+                         _("Save document before quitting?"),
+                         /* Button in dialog to quit and discard unsaved document */
+                         _("Quit without Saving")))
+        return FALSE;
 
     device = get_selected_device (ui);
     if (device) {
@@ -1151,6 +1332,8 @@ quit (SimpleScan *ui)
     gconf_client_set_int (ui->priv->client, GCONF_DIR "/page_dpi", ui->priv->default_page_dpi, NULL);
    
     g_signal_emit (G_OBJECT (ui), signals[QUIT], 0);
+
+    return TRUE;
 }
 
 
@@ -1177,6 +1360,24 @@ simple_scan_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *eve
 }
 
 
+static void
+info_bar_response_cb (GtkWidget *widget, gint response_id, SimpleScan *ui)
+{
+    if (response_id == 1) {
+        gtk_widget_grab_focus (ui->priv->device_combo);
+        gtk_window_present (GTK_WINDOW (ui->priv->preferences_dialog));
+    }
+    else {
+        ui->priv->have_error = FALSE;
+        g_free (ui->priv->error_title);
+        ui->priv->error_title = NULL;
+        g_free (ui->priv->error_text);
+        ui->priv->error_text = NULL;
+        update_info_bar (ui);      
+    }
+}
+
+
 gboolean simple_scan_window_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, SimpleScan *ui);
 G_MODULE_EXPORT
 gboolean
@@ -1193,8 +1394,7 @@ G_MODULE_EXPORT
 gboolean
 window_delete_event_cb (GtkWidget *widget, GdkEvent *event, SimpleScan *ui)
 {
-    quit (ui);
-    return TRUE;
+    return !quit (ui);
 }
 
 
@@ -1290,10 +1490,21 @@ set_dpi_combo (GtkWidget *combo, gint default_dpi, gint current_dpi)
 
 
 static void
+needs_saving_cb (Book *book, GParamSpec *param, SimpleScan *ui)
+{
+    gtk_widget_set_sensitive (ui->priv->save_menuitem, book_get_needs_saving (book));
+    gtk_widget_set_sensitive (ui->priv->save_toolbutton, book_get_needs_saving (book));
+    if (book_get_needs_saving (book))
+        gtk_widget_set_sensitive (ui->priv->save_as_menuitem, TRUE);
+}
+
+
+static void
 ui_load (SimpleScan *ui)
 {
     GtkBuilder *builder;
     GError *error = NULL;
+    GtkWidget *hbox;
     GtkCellRenderer *renderer;
     gchar *device, *document_type, *scan_direction, *page_side;
     gint dpi, paper_width, paper_height;
@@ -1306,12 +1517,11 @@ ui_load (SimpleScan *ui)
     gtk_builder_add_from_file (builder, UI_DIR "simple-scan.ui", &error);
     if (error) {
         g_critical ("Unable to load UI: %s\n", error->message);
-        ui_show_error (ui,
-                       /* Title of dialog when cannot load required files */
-                       _("Files missing"),
-                       /* Description in dialog when cannot load required files */
-                       _("Please check your installation"),
-                       FALSE);
+        show_error_dialog (ui,
+                           /* Title of dialog when cannot load required files */
+                           _("Files missing"),
+                           /* Description in dialog when cannot load required files */
+                           _("Please check your installation"));
         exit (1);
     }
     gtk_builder_connect_signals (builder, ui);
@@ -1320,6 +1530,9 @@ ui_load (SimpleScan *ui)
     ui->priv->main_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_vbox"));
     ui->priv->page_delete_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "page_delete_menuitem"));
     ui->priv->crop_rotate_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "crop_rotate_menuitem"));
+    ui->priv->save_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "save_menuitem"));
+    ui->priv->save_as_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "save_as_menuitem"));
+    ui->priv->save_toolbutton = GTK_WIDGET (gtk_builder_get_object (builder, "save_toolbutton"));
     ui->priv->stop_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "stop_scan_menuitem"));
     ui->priv->stop_toolbutton = GTK_WIDGET (gtk_builder_get_object (builder, "stop_toolbutton"));
 
@@ -1345,6 +1558,28 @@ ui_load (SimpleScan *ui)
     ui->priv->paper_size_combo = GTK_WIDGET (gtk_builder_get_object (builder, "paper_size_combo"));
     ui->priv->paper_size_model = gtk_combo_box_get_model (GTK_COMBO_BOX (ui->priv->paper_size_combo));
 
+    /* Add InfoBar (not supported in Glade) */
+    ui->priv->info_bar = gtk_info_bar_new ();
+    g_signal_connect (ui->priv->info_bar, "response", G_CALLBACK (info_bar_response_cb), ui);  
+    gtk_box_pack_start (GTK_BOX(ui->priv->main_vbox), ui->priv->info_bar, FALSE, TRUE, 0);
+    hbox = gtk_hbox_new (FALSE, 12);
+    gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (ui->priv->info_bar))), hbox);
+    gtk_widget_show (hbox);
+
+    ui->priv->info_bar_image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+    gtk_box_pack_start (GTK_BOX(hbox), ui->priv->info_bar_image, FALSE, TRUE, 0);
+    gtk_widget_show (ui->priv->info_bar_image);
+
+    ui->priv->info_bar_label = gtk_label_new (NULL);
+    gtk_misc_set_alignment (GTK_MISC (ui->priv->info_bar_label), 0.0, 0.5);
+    gtk_box_pack_start (GTK_BOX(hbox), ui->priv->info_bar_label, TRUE, TRUE, 0);
+    gtk_widget_show (ui->priv->info_bar_label);
+
+    ui->priv->info_bar_close_button = gtk_info_bar_add_button (GTK_INFO_BAR (ui->priv->info_bar), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+    ui->priv->info_bar_change_scanner_button = gtk_info_bar_add_button (GTK_INFO_BAR (ui->priv->info_bar),
+                                                                        /* Button in error infobar to open preferences dialog and change scanner */
+                                                                        _("Change _Scanner"), 1);
+
     GtkTreeIter iter;
     gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
     gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 0, 1, 0, 2,
@@ -1451,6 +1686,8 @@ ui_load (SimpleScan *ui)
 
     if (book_get_n_pages (ui->priv->book) == 0)
         add_default_page (ui);
+    book_set_needs_saving (ui->priv->book, FALSE);
+    g_signal_connect (ui->priv->book, "notify::needs-saving", G_CALLBACK (needs_saving_cb), ui);
 }
 
 
@@ -1495,28 +1732,13 @@ ui_set_scanning (SimpleScan *ui, gboolean scanning)
 void
 ui_show_error (SimpleScan *ui, const gchar *error_title, const gchar *error_text, gboolean change_scanner_hint)
 {
-    GtkWidget *dialog;
-
-    dialog = gtk_message_dialog_new (GTK_WINDOW (ui->priv->window),
-                                     GTK_DIALOG_MODAL,
-                                     GTK_MESSAGE_WARNING,
-                                     GTK_BUTTONS_NONE,
-                                     "%s", error_title);
-    if (change_scanner_hint)
-        gtk_dialog_add_button (GTK_DIALOG (dialog),
-                               /* Button in error dialog to open prefereces dialog and change scanner */
-                               _("Change _Scanner"),
-                               1);
-    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, 0);
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                              "%s", error_text);
-
-    if (gtk_dialog_run (GTK_DIALOG (dialog)) == 1) {
-        gtk_widget_grab_focus (ui->priv->device_combo);
-        gtk_window_present (GTK_WINDOW (ui->priv->preferences_dialog));        
-    }
-
-    gtk_widget_destroy (dialog);
+    ui->priv->have_error = TRUE;
+    g_free (ui->priv->error_title);
+    ui->priv->error_title = g_strdup (error_title);
+    g_free (ui->priv->error_text);
+    ui->priv->error_text = g_strdup (error_text);
+    ui->priv->error_change_scanner_hint = change_scanner_hint;
+    update_info_bar (ui);
 }
 
 
@@ -1606,14 +1828,6 @@ ui_class_init (SimpleScanClass *klass)
                       NULL, NULL,
                       g_cclosure_marshal_VOID__VOID,
                       G_TYPE_NONE, 0);
-    signals[SAVE] =
-        g_signal_new ("save",
-                      G_TYPE_FROM_CLASS (klass),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (SimpleScanClass, save),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__STRING,
-                      G_TYPE_NONE, 1, G_TYPE_STRING);
     signals[EMAIL] =
         g_signal_new ("email",
                       G_TYPE_FROM_CLASS (klass),
@@ -1650,5 +1864,5 @@ ui_init (SimpleScan *ui)
     ui->priv->document_hint = g_strdup ("photo");
     ui->priv->default_file_name = g_strdup (_("Scanned Document.pdf"));
     ui->priv->scanning = FALSE;
-    ui_load (ui);   
+    ui_load (ui);
 }
diff --git a/src/ui.h b/src/ui.h
index 41d551f..d43c187 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -36,7 +36,6 @@ typedef struct
 
     void (*start_scan) (SimpleScan *ui, ScanOptions *options);
     void (*stop_scan) (SimpleScan *ui);
-    void (*save) (SimpleScan *ui, const gchar *format);
     void (*email) (SimpleScan *ui, const gchar *profile);
     void (*quit) (SimpleScan *ui);
 } SimpleScanClass;