Merging from HEAD

2 files changed, 351 insertions, 185 deletions

diff --git a/help/es/Makefile.in b/help/es/Makefile.in
index 11d9e0444..7b6173642 100644
--- a/help/es/Makefile.in
+++ b/help/es/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# 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.
@@ -10,6 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
 
 #
 # No modifications of this Makefile should be necessary.
@@ -45,23 +48,17 @@
 #	Version: 0.1.2 (last updated: March 20, 2002)
 #
 
-# ************* Begin of section some packagers may need to modify  **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-
-
 # 
 # No modifications of this Makefile should be necessary.
 #
 # This file contains the build instructions for installing OMF files.  It is
 # generally called from the makefiles for particular formats of documentation.
 #
-# Note that you must configure your package with --localstatedir=/var/lib
+# Note that you must configure your package with --localstatedir=/var
 # so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
-# If it is impossible to configure with --localstatedir=/var/lib, then
+# If it is impossible to configure with --localstatedir=/var, then
 # modify the definition of scrollkeeper_localstate_dir so that
 # it points to the correct location. Note that you must still use 
 # $(localstatedir) in this or when people build RPMs it will update
@@ -72,97 +69,215 @@
 #       and the makefiles for these formats should also include this file.
 #
 # About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper
-#	0.3.x and 0.4.x.  For more information, see:
+#	This file was derived from scrollkeeper_example2, a package
+#	illustrating how to install documentation and OMF files for use with
+#	ScrollKeeper 0.3.x and 0.4.x.  For more information, see:
 #		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.2 (last updated: March 20, 2002)
+# 	Version: 0.1.3 (last updated: March 20, 2002)
 #
 
-
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+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 = :
-host_alias = @host_alias@
 host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
 AM_CXXFLAGS = @AM_CXXFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
 BONOBO_ACTIVATION_IDL = @BONOBO_ACTIVATION_IDL@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ENABLE_NAUTILUS_VIEW_FALSE = @ENABLE_NAUTILUS_VIEW_FALSE@
+ENABLE_NAUTILUS_VIEW_TRUE = @ENABLE_NAUTILUS_VIEW_TRUE@
 EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
 EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
 EPIPHANY_MAJOR = @EPIPHANY_MAJOR@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_REQUIRED = @GLIB_REQUIRED@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
 GTK_REQUIRED = @GTK_REQUIRED@
 HTML_DIR = @HTML_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
 LIBBONOBOUI_REQUIRED = @LIBBONOBOUI_REQUIRED@
 LIBBONOBO_IDL = @LIBBONOBO_IDL@
 LIBGLADE_REQUIRED = @LIBGLADE_REQUIRED@
 LIBGNOMEVFS_REQUIRED = @LIBGNOMEVFS_REQUIRED@
+LIBNAUTILUS_REQUIRED = @LIBNAUTILUS_REQUIRED@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBXML_REQUIRED = @LIBXML_REQUIRED@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
 MOZILLA_COMPONENT_LIBS = @MOZILLA_COMPONENT_LIBS@
 MOZILLA_HOME = @MOZILLA_HOME@
 MOZILLA_INCLUDE_ROOT = @MOZILLA_INCLUDE_ROOT@
+MOZILLA_WARN_CXXFLAGS = @MOZILLA_WARN_CXXFLAGS@
+MSGFMT = @MSGFMT@
+NAUTILUS_DEPENDENCY_CFLAGS = @NAUTILUS_DEPENDENCY_CFLAGS@
+NAUTILUS_DEPENDENCY_LIBS = @NAUTILUS_DEPENDENCY_LIBS@
+OBJEXT = @OBJEXT@
 ORBIT_IDL = @ORBIT_IDL@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+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@
 RANLIB = @RANLIB@
-
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 figdir = figures
 docname = epiphany
 lang = es
 omffile = epiphany-es.omf
 entities = legal.xml
 
+# **********  Begin of section some packagers may need to modify  **********
+# This variable (docdir) specifies where the documents should be installed.
+# This default value should work for most packages.
 docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 
-# **************  You should not have to edit below this line  *******************
+# **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml
 
 EXTRA_DIST = $(xml_files) $(omffile)
@@ -170,124 +285,170 @@ CLEANFILES = omf_timestamp
 
 omf_dest_dir = $(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+subdir = help/es
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/omf.make \
+	$(top_srcdir)/xmldocs.make Makefile.am
+all: all-am
 
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu help/C/Makefile
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  help/es/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+	-rm -f *.lo
 
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = help/C
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu help/C/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	$(mkinstalldirs) $(distdir)/../..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile
 
-install-data-am: install-data-local
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+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
-install: install-am
-uninstall-am: uninstall-local
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+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:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
+dvi-am:
 
-distclean: distclean-am
+info: info-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am: install-data-local
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
 
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+uninstall-am: uninstall-info-am uninstall-local
 
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am info info-am install install-am install-data \
+	install-data-am install-data-local install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am uninstall-local
+
+
+# At some point, it may be wise to change to something like this:
+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
 
 omf: omf_timestamp
 
 omf_timestamp: $(omffile)
 	-for file in $(omffile); do \
 	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done
+	done; \
 	touch omf_timestamp
 
 install-data-hook-omf:
@@ -305,6 +466,11 @@ uninstall-local-omf:
 	-rmdir $(omf_dest_dir)
 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
+clean-local-omf:
+	-for file in $(omffile); do \
+		rm -f $$file.out; \
+	done
+
 all: omf
 
 $(docname).xml: $(entities)
@@ -342,7 +508,7 @@ uninstall-local-doc:
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(docdir)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
 	  done; \
 	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
 	fi
@@ -350,8 +516,9 @@ uninstall-local-doc:
 	  rm -f $(DESTDIR)$(docdir)/$$file; \
 	done
 	-rmdir $(DESTDIR)$(docdir)
-dist-hook: app-dist-hook
 
+clean-local: clean-local-omf
+dist-hook: app-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/help/es/epiphany.xml b/help/es/epiphany.xml
index 386d9c47c..e4796239f 100644
--- a/help/es/epiphany.xml
+++ b/help/es/epiphany.xml
@@ -358,155 +358,154 @@
 	<sect2 id="using-toolbar">
           <title>Uso de la barra de herramientas</title>
           <para>
-            The toolbar contains a number of shortcuts to commonly 
-            used functions. You can use the toolbar to navigate 
-            through your web history by clicking the back and 
-            forward buttons. In addition it is possible to stop the 
-            loading of pages by clicking the stop button. Finally 
-            pages may be reloaded by clicking the reload button.
+            La barra de herramientas contiene un número de atajos a funciones
+	    usadas comúnmente. Puede usar la barra de tareas para navegar 
+            a través del histórico web pulsando los botones atrás y adelante. 
+            Finalmente las páginas pueden ser recargadas pulsando el botón
+            de recarga.
           </para>
           <para>
-            You can customize the buttons which appear on your 
-            toolbar by using the Toolbar Editor: for details, see 
+            Puede personalizar los botones que aparecen en su barra de tareas 
+            usando el Editor de barras de tareas: para más detalles, vea 
             <xref linkend="to-edit-toolbars"/>.
           </para>
         </sect2>
 	<sect2 id="using-bookmarks-bar">
-          <title>Using the Bookmarks Bar</title>
+          <title>Uso de la barra de marcadores</title>
           <para>
-            The Bookmarks Bar allows you to have links to your favorite 
-            websites on a toolbar for easy access. For details on 
-            adding bookmarks to the bookmarks bar, see <xref 
+            La barra de marcadores permite tener enlaces a sus sitios web favoritos
+	    en una barra de tareas para acceso fácil. Para más detalles acerca de 
+            añadir marcadores a la barra de marcadores, vea el <xref 
             linkend="to-add-bookmark-or-topic-to-bookmarks-bar"/>.
           </para>
         </sect2>
 	<sect2 id="using-fullscreen-mode">
-          <title>Using Fullscreen Mode</title>
+          <title>Uo del modo a pantalla completa</title>
           <para>
-            Fullscreen mode allows the browser to use the whole screen 
-            for its viewable area. To enter Fullscreen mode, select 
-            <menuchoice> <guimenu>View</guimenu> <guimenuitem>Fullscreen
+            El modo a pantalla completa permite al navegador usar toda la pantalla para
+	    el área visible. Para entrar en el modo «Pantalla completa», seleccione  
+            <menuchoice> <guimenu>Ver</guimenu> <guimenuitem>Pantalla completa
             </guimenuitem> </menuchoice>.
           </para>
           <para>
-            You can exit Fullscreen mode by clicking <guibutton>Exit 
-            Fullscreen</guibutton>.
+            Puede salir del modo a pantalla completa pulsando el botón <guibutton>Salir 
+            de pantalla completa</guibutton>.
           </para>
         </sect2>
 	<sect2 id="to-open-new-window">
-          <title>To Open a New Window</title>
+          <title>Para abrir una ventana nueva</title>
           <para>
-            To open a new window, choose <menuchoice> <guimenu>
-            File</guimenu> <guimenuitem>New Window</guimenuitem>
+            Para abrir una ventana nueva, elija <menuchoice> <guimenu>
+            Archivo</guimenu> <guimenuitem>Ventana nueva</guimenuitem>
 	    </menuchoice>.
 	  </para>
         </sect2>
 	<sect2 id="to-open-new-tab">
-          <title>To Open a New Tab</title>
+          <title>Para abrir una solapa nueva</title>
           <para>
-            To open a new tab, choose <menuchoice> <guimenu>
-            File</guimenu> <guimenuitem>New Tab</guimenuitem>
-            </menuchoice>. The new tab will be place to the right of 
-            any existing tabs.
+            Para abrir una solapa nueva, elija <menuchoice> <guimenu>
+            Archivo</guimenu> <guimenuitem>Solapa nueva</guimenuitem>
+            </menuchoice>. La solapa nueva se colocará a la derecha de cualquier 
+            solapa ya existente.
 	  </para>
 	</sect2>
 	<sect2 id="ephy-to-open-file">
-          <title>To Open a File</title>
+          <title>Para abrir un archivo</title>
           <para>
-            To open a file, choose <menuchoice> <guimenu>File
-            </guimenu> <guimenuitem>Open...</guimenuitem>
-            </menuchoice> to display the <guilabel>Open File</guilabel> 
-            dialog. Select the file that you want to open, then click 
-            <guibutton>OK</guibutton>. The file is displayed in the 
-            browser window.
+            Para abrirun archivo, elija <menuchoice> <guimenu>Archivo
+            </guimenu> <guimenuitem>Abrir...</guimenuitem>
+            </menuchoice> para mostrar el diálogo <guilabel>Abrir archivo</guilabel>. 
+            Seleccione el archivo que quiera abrir, después pulse  
+            <guibutton>Aceptar</guibutton>. El archivo se muestra en la 
+            ventana del navegador.
           </para>
         </sect2>
 	<sect2 id="to-save-page-to-file">
-          <title>To Save a Page to a File</title>
+          <title>Para guardar una página en un archivo</title>
           <para>
-             To save a page to a file, choose <menuchoice> <guimenu>
-             File</guimenu> <guimenuitem>Save As</guimenuitem> 
-             </menuchoice>. Enter a name for the file in the <guilabel>
-             Save As</guilabel> dialog box, then click <guibutton>OK
+             Para guardar una página en un archivo. elija <menuchoice> <guimenu>
+             Archivo</guimenu> <guimenuitem>Guardar como</guimenuitem> 
+             </menuchoice>. Introduzca un nombre para el archivo en la caja de diálogo<guilabel>
+             Guardar como</guilabel>, después pulse en el botón <guibutton>Aceptar
              </guibutton>.
           </para>
         </sect2>
         <sect2 id="using-print-setup">
-          <title>Using Print Setup</title>
+          <title>Usar la configuración de impresión</title>
           <para>
-            Print setup allows you to configure how web pages are printed.
+            La configuración de impresión le permite a usted configurar cómo se imprimen las páginas web.
           </para>
           <variablelist>
             <varlistentry>
-              <term>Margins</term>
+              <term>Márgenes</term>
               <listitem>
                 <para>
-                  The distance from the edge of the page to the content.
+                  La distancia desde el borde de la hoja al contenido.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Colors</term>
+              <term>Colores</term>
               <listitem>
                 <para>
-                  Print in grayscale or color.
+                  Imprimir en color o en escala de grises.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Footers</term>
+              <term>Pie de página</term>
               <listitem>
                 <para>
-                  Choose whether to display page numbers and current date
-                  at the bottom of every page.
+                  Elija si quiere mostrar números de página y la fecha actual 
+                  en la parte inferior de cada página.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Headers</term>
+              <term>Cabeceras</term>
               <listitem>
                 <para>
-                  Choose whether to display the web page title and address
-                  at the top of every page.
+                  Elija si quiere mostrar el título de la página web y la dirección 
+                  en la parte superior de cada página.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Size</term>
+              <term>Tamaño</term>
               <listitem>
                 <para>
-                  The paper size.
+                  El tamaño de la hoja de papel.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Orientation</term>
+              <term>Orientación</term>
               <listitem>
                 <para>
-                  Defines whether the top of the page is the short (portrait) or 
-                  long (landscape) edge of the paper.
+                  Define si la parte superior de la página es el borde corto (vertical) o 
+                  el largo (apaisado) del papel.
                 </para>
               </listitem>
             </varlistentry>
           </variablelist>
         </sect2>
         <sect2 id="using-print-preview">
-          <title>Using Print Preview</title>
+          <title>Uo de la vista preliminar</title>
           <para>
-            With print preview, you can see how a page will look once it has been 
-            printed. To print preview the current page, choose <menuchoice> 
-            <guimenu>File</guimenu> <guimenuitem>Print Preview</guimenuitem> 
+            Con la vista preliminar de impresión, puede ver cómo será la apariencia de una página 
+            una vez sea impresa. Para ver una vista preliminar de impresión de la página actual,
+            elija <menuchoice> <guimenu>Archivo</guimenu> <guimenuitem>Impresión preliminar</guimenuitem> 
             </menuchoice>. 
           </para>
         </sect2>
 	<sect2 id="to-print-page">
-          <title>To Print a Page</title>
+          <title>Para imprimir una página</title>
           <para>
-            To print a page, choose <menuchoice> <guimenu>File</guimenu>
-            <guimenuitem>Print</guimenuitem> </menuchoice>. Enter the 
-            name of the printer in the <guilabel>Printer</guilabel> 
-            field or enter a name in the <guilabel>File</guilabel> field 
-            to print to a file.
+            Para imprimir una página, elija <menuchoice> <guimenu>Archivo</guimenu>
+            <guimenuitem>Imprimir</guimenuitem> </menuchoice>. Introduzca el  
+            nombre de la impresora en el campo <guilabel>Impresora</guilabel> 
+            o introduzca un nombre en el campo <guilabel>Archivo</guilabel>  
+            para imprimir en un archivo.
           </para>
           <para>
             In the <guilabel>Page Range</guilabel> section, choose <guilabel>